Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java
	haoban-manage3-service/src/main/resources/mapper/TabQywxErrorLogMapper.xml