-
Merge remote-tracking branch 'origin/feature/无效接口删除' into developer · b846aead
# Conflicts: # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ValidationCodeApiService.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ValidationCodeApiServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
jinxin authored
×