Merge branch 'dev_v1.5.20.2_wh' of jianyu/datatools into hotfix/v1.5.20.2

clueSync/jobutil.go

@@ -762,8 +762,8 @@ func saleLeads() {
 func userbase() {
 	log.Println("userbase定时任务开始")
 	timeUnix := time.Now().Unix()
-	selectTimeEnd := time.Unix(timeUnix-1800, 0).Format("2006-01-02 15:04:05")
-	selectTimeStart := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
+	selectTimeStart := time.Unix(timeUnix-1800, 0).Format("2006-01-02 15:04:05")
+	selectTimeEnd := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
 	sql := fmt.Sprintf(`SELECT
 		a.phone,b.uid,a.baseinfo_id,b.l_registedate,a.createtime,b.id
 	FROM