-
Merge remote-tracking branch 'origin/feature-content2' into · a0249abd
feature/自建应用验证 Conflicts: haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
徐高华 authored