# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ValidationCodeApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ValidationCodeApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

# 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

导购状态

See merge request !899

Feature/获取用户敏感信息

See merge request !898

Merge branch 'feature/获取用户敏感信息' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/获取用户敏感信息

token

See merge request !897

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

好友状态bug调整

See merge request !896

sql

See merge request !895

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeOrderService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeOrderServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeOrderMapper.xml

朋友圈

See merge request !892

非空判断

See merge request !891

朋友圈

See merge request !890

Master 118

See merge request !889

朋友圈图片url

See merge request !888

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/CommonUtil.java

朋友圈

See merge request !887