Merge branch 'dev_v1.5.29_wh' of jianyu/datatools into feature/v1.5.29

clueSync/jobutil.go

@@ -767,7 +767,7 @@ func userbase() {
 	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,b.userid
+		a.phone,b.uid,a.baseinfo_id,b.l_registedate,a.createtime,b.id,b.userid,b.resource
 	FROM
 		dwd_f_userbase_contacts a
 	INNER JOIN dwd_f_userbase_baseinfo b ON