fix：merge

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

@@ -14,10 +14,6 @@
 	<dubbo:application name="haoban-manage3-web"/>
 
 	<dubbo:protocol name="dubbo" port="30009"/>
-	<!-- 使用zookeeper注册中心暴露服务地址 -->
-	<!--      <dubbo:registry address="zookeeper://192.168.1.118:2181" protocol="dubbo" id="localAdd"/> -->
-	<!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->
-	<!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
 
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffApiService" id="staffApiService"
 					 timeout="15000"/>
@@ -89,15 +85,11 @@
 
 	<dubbo:reference id="operationSettingApiServiceImpl"
 					 interface="com.gic.haoban.manage.api.service.OperationSettingApiService" timeout="10000"
-	<dubbo:reference id="operationSettingApiServiceImpl"
-					 interface="com.gic.haoban.manage.api.service.OperationSettingApiService" timeout="10000"
 					 retries="0" check="false"/>
 
 	<dubbo:reference id="externalClerkRelatedApiService"
 					 interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService" timeout="10000"
 					 retries="0" check="false"/>
 
-	<dubbo:reference interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
-					 id="externalClerkRelatedApiService"/>
 
 </beans>