# Conflicts: # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxErrorLogApiService.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxErrorLogService.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TabQywxErrorLogServiceImpl.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java # haoban-manage3-service/src/main/resources/mapper/TabQywxErrorLogMapper.xml