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

corpid

See merge request !231

Master xgh 好办停用

See merge request !230

Master xgh 会员待开发+商户停用

See merge request !229

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

master-xgh-好办停用

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

好办停用

See merge request !226

商户停用

See merge request !225

好办停用

See merge request !224

删除好办定时

See merge request !223

Master xgh 好办停用

See merge request !222

过期停用

See merge request !221

商户停用

See merge request !219

好办停用

See merge request !218

好办停用

See merge request !217

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

好办停用

See merge request !215

Master xgh 好办停用

See merge request !214