# Conflicts: # 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-service/src/test/java/GroupMessageServiceTest.java # haoban-manage3-service/src/test/java/NotityTest.java
