Conflicts: haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
