Merge branch 'master_xgh_停用功能' into 'developer'

log

See merge request !186

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

@@ -118,7 +118,7 @@ public class StoreController extends WebBaseController {
         }
         //主门店
         ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
-        String mainStoreId = "-1" ; //.= mainDTO == null ? "" : mainDTO.getStoreId();
+        String mainStoreId =  mainDTO == null ? "" : mainDTO.getStoreId();
         Map<String,Boolean> map = new HashMap<>();
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
             String storeId = staffClerkRelationDTO.getStoreId() ;