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

clueSync/job.go

@@ -1370,7 +1370,6 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 			clueUpdateData["position_id"] = positionId
 			clueUpdateData["comeintime"] = nowTime
 			clueUpdateData["is_assign"] = 1
-			clueUpdateData["is_assign"] = 1
 			clueUpdateData["comeinsource_open"] = nil
 			clueUpdateData["level_open"] = nil
 			clueUpdateData["clue_level"] = nil

clueSync/main.go

@@ -137,11 +137,6 @@ func main() {
 	MgoQyxy = mongodb.NewMgoWithUser(db.MgoQyxy.Address, db.MgoQyxy.DbName, db.MgoQyxy.User, db.MgoQyxy.Password, db.MgoQyxy.DbSize)
 	InitArea()
 	InitProduct(db.ProductArr)
-<<<<<<< HEAD
-	tagAllSync()
-	//activeUsers() //取关重新关注处理
-=======
->>>>>>> master
 	if *mode == 1 {
 		//30分钟一次
 		go p.VarTimeTask.RunInTimeLoop("30分钟定时任务", "", "", db.CornExp1, true, true, nil, func() {