Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java
	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

结束不统计

See merge request !819

Feature/社群

See merge request !818

欢迎语日志

See merge request !817

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

Feature/社群

See merge request !815

Feature/社群

See merge request !814

小程序查询

See merge request !813

通过导购查询

See merge request !812

店长

See merge request !811

计划名称

See merge request !810

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

排序

See merge request !807

/

See merge request !805

小程序查询接口

See merge request !804

Feature/社群

See merge request !803

sql

See merge request !801

群主变更

See merge request !800