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

log

See merge request !184

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

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -20,26 +33,33 @@ import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.data.api.dto.HaobanDataDTO;
 import com.gic.haoban.data.api.service.HaobanDataApiService;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.AuditDTO;
+import com.gic.haoban.manage.api.dto.AuditSettingDTO;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
 import com.gic.haoban.manage.api.enums.StoreFieldEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.AuditApiService;
+import com.gic.haoban.manage.api.service.AuditSettingApiService;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.StaffStoreVO;
 import com.gic.haoban.manage.web.vo.StoreDetailVO;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 
 @RestController
 public class StoreController extends WebBaseController {
-    private static final Logger logger = LoggerFactory.getLogger(StoreController.class);
+    private static org.apache.logging.log4j.Logger logger= LogManager.getLogger(StoreController.class);
 
     @Autowired
     private ClerkService clerkService;
@@ -174,6 +194,7 @@ public class StoreController extends WebBaseController {
             vo.setCorpName(wxEnterpriseDTO.getCorpName());
             list.add(vo);
         }
+        
         return resultResponse(HaoBanErrCode.ERR_1, list);
     }