# Conflicts: # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatUserMapper.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/ApolloUtils.java
