合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java

@@ -33,7 +33,7 @@
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
        basePackages = {"com.java110.fee.listener"})
@EnableFeignClients(basePackages = {"com.java110.intf.user", "com.java110.intf.order", "com.java110.intf.community","com.java110.intf.store"})
@EnableFeignClients(basePackages = {"com.java110.intf.user", "com.java110.intf.order", "com.java110.intf.community","com.java110.intf.job","com.java110.intf.store"})
public class FeeServiceApplicationStart {

    private static Logger logger = LoggerFactory.getLogger(FeeServiceApplicationStart.class);