feat:冲突合并

entniche_new/src/config.json

@@ -58,11 +58,8 @@
     "浙江华数广电网络股份有限公司"
   ],
   "portraitStartTime": 2018,
-<<<<<<< HEAD
   "portraitDynamicTime": 7,
-  "portraitCount": 30
-=======
+  "portraitCount": 30,
   "nsq":"192.168.3.240:4260",
   "nsq_topic": "jy_event"
->>>>>>> master
 }

entniche_new/src/config/config.go

@@ -61,7 +61,6 @@ type config struct {
 		EnterpriseNumb int64
 		PersonalNumb   int64
 	} // 商机管理服务认领数量限制
-<<<<<<< HEAD
 	OneAreaTimesBuyer   int
 	RecommendThreshold  float32
 	Customers           []customerInfo
@@ -70,16 +69,8 @@ type config struct {
 	PortraitStartTime   int `json:"portraitStartTime"`
 	PortraitDynamicTime int `json:"portraitDynamicTime"`
 	PortraitCount       int `json:"portraitCount"`
-=======
-	OneAreaTimesBuyer  int
-	RecommendThreshold float32
-	Customers          []customerInfo
-	Entcustomer        []string
-	SearchPCount       int
-	PortraitStartTime  int `json:"portraitStartTime"`
-	Nsq                string
-	Nsq_topic          string
->>>>>>> master
+	Nsq                 string
+	Nsq_topic           string
 }
 
 type timeTaskConfig struct {