Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !354

haoban-manage3-wx/pom.xml

@@ -194,16 +194,22 @@
             <artifactId>gic-marketing-pro-api</artifactId>
             <version>${gic-marketing-pro-api}</version>
         </dependency>
-         <dependency>
+         <!-- <dependency>
             <groupId>com.gic</groupId>
             <artifactId>gic-enterprise-operation-api</artifactId>
             <version>${gic-enterprise-operation-api}</version>
-        </dependency>
-         <dependency>
+            <exclusions>
+            	<exclusion>
+            		 <artifactId>hibernate-validator</artifactId>
+            		 <groupId>org.hibernate.validator</groupId>
+            	</exclusion>
+            </exclusions>
+        </dependency> -->
+       <!--   <dependency>
             <groupId>com.gic</groupId>
             <artifactId>gic-game-api</artifactId>
             <version>${gic-game-api}</version>
-        </dependency>
+        </dependency> -->
     </dependencies>
 
     <build>

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -18,9 +18,9 @@
     <dubbo:reference interface="com.gic.marketing.api.service.SmsService" id="smsService" />
     <dubbo:reference interface="com.gic.marketing.api.service.WechatMarketingService" id="wechatMarketingService" />
     <dubbo:reference interface="com.gic.marketing.pro.api.service.ai.AiMemberLogApiService" id="aiMemberLogApiService" />
-    <dubbo:reference interface="com.gic.enterprise.service.CustomSettingApiService" id="customSettingApiService" />
     <dubbo:reference interface="com.gic.marketing.api.service.CouponCardService" id="couponCardService" />
-    <dubbo:reference interface="com.gic.game.api.service.GameService" id="gameService" />
+<!--     <dubbo:reference interface="com.gic.game.api.service.GameService" id="gameService" />
+    <dubbo:reference interface="com.gic.enterprise.service.CustomSettingApiService" id="customSettingApiService" /> -->
     <dubbo:reference interface="com.gic.marketing.pro.api.service.game.GameApiService" id="gameApiService" />
     <dubbo:reference interface="com.gic.member.api.service.AchievementService" id="achievementService" />