Merge branch 'dev_v1.0.34_wh' of BaseService/biService into feature/v1.0.34

service/clue.go

@@ -775,13 +775,8 @@ func batchDraw(data []map[string]interface{}, nowTime, seatNumber, name string,
 			//标签处理
 			label := gconv.Int64(v["label"])
 			trailstatusCode := gconv.String(v["trailstatus"])
-<<<<<<< HEAD
-			LabelHandel(tx, label, 3, clueId, "", "01", trailstatusCode, labelChangeTime)
-			return ok1 && recordId > 0 && recordId1 > 0 && recordId2 > 0 && recordId3 > -1 && recordId4 > -1 && recordId5 > -1 && recordId6 > -1
-=======
 			LabelHandel(tx, label, 3, clueId, "", "01", trailstatusCode, name, "/", 0)
-			return ok1 && recordId > 0 && recordId1 > 0 && recordId2 > 0 && recordId3 > -1 && recordId4 > -1
->>>>>>> master
+			return ok1 && recordId > 0 && recordId1 > 0 && recordId2 > 0 && recordId3 > -1 && recordId4 > -1 && recordId5 > -1 && recordId6 > -1
 		}) {
 			logx.Info("领取线索成功")
 			count++