Conflicts: haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterprise.java haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml
