Conflicts: haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxErrorLogDTO.java haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/QywxErrorLogListQDTO.java 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/entity/TabQywxErrorLog.java haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/TabQywxErrorLogBO.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
