'产说会新增'

src/assets/js/utils/request.js

@@ -99,8 +99,11 @@ let performanceRanking = ['/data/performance/getComList', '/data/performance/get
 let hgb = ['/sale/order/selectHgb', '/sale/order/getHgbDetail']
 let whitelist = ['/agent/white/getWhiteInfo']
 
+<<<<<<< HEAD
 // 开门红
 let goodStart = ['/data/performance/getComPerformance']
+=======
+>>>>>>> feature/GFRS-2266【需求】产说会需求
 let eqiVisit = [
   '/agent/accompany/getAccompanyComCode',
   '/agent/accompany/getAccompanyPerson',
@@ -125,7 +128,10 @@ let whiteList = [
   ...performanceRanking,
   ...hgb,
   ...whitelist,
+<<<<<<< HEAD
   ...goodStart,
+=======
+>>>>>>> feature/GFRS-2266【需求】产说会需求
   ...eqiVisit
 ]