Merge branch 'dev_v1.0.7_wh' of CRM/application into feature/v1.0.7

api/common/initconfig.go

@@ -37,7 +37,7 @@ var DB config.Db
 
 var pushFile = flag.String("pf", "etc/push.yaml", "the push file")
 var Push config.Push
-var AreaCodeMap map[string]interface{}
+var AreaCodeMap map[string]string
 
 var (
 	MgoBidding        mongodb.MongodbSim

api/internal/service/employService.go

@@ -280,9 +280,9 @@ func infoFind(id string, v1 string) map[string]interface{} {
 		//省份代码处理
 		areaCode := ""
 		if MC.AreaCodeMap[city] != "" {
-			areaCode = gconv.String(MC.AreaCodeMap[city])
+			areaCode = MC.AreaCodeMap[city]
 		} else {
-			areaCode = gconv.String(MC.AreaCodeMap[area])
+			areaCode = MC.AreaCodeMap[area]
 		}
 		data["area_code"] = areaCode
 		data["subtype"] = obj["subtype"]