Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer

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

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

@@ -130,6 +130,10 @@ public class StoreController extends WebBaseController {
                 continue;
             }
             String enterpriseId = store.getEnterpriseId();
+            if(StringUtils.isNotBlank(gicEnterpriseId) && !gicEnterpriseId.equals(enterpriseId)) {
+                logger.info("非当前商户,直接跳过={},{}",gicEnterpriseId,enterpriseId);
+                continue ;
+            }
             ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
             if (clerk == null) {
                 continue;