merge

clueSync/jobutil.go

@@ -340,13 +340,9 @@ func FindNumber(moudle string) string {
 }
 
 // 人员查询
-<<<<<<< HEAD
-func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}, creatorTime string) map[string]interface{} {
 
-=======
 func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}) map[string]interface{} {
 	log.Println("分配比例查询", cfg.AllocationTime, cfg.AllocationRatio, proportion1, proportion3, deptCount1, deptCount3)
->>>>>>> master
 	if deptCount1 == 0 {
 		return administrators1
 	}