Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmStoreController.java

@@ -204,7 +204,6 @@ public class HmStoreController {
         if (CollectionUtils.isEmpty(authStoreIdList)) {
             return RestResponse.failure("-1", "无授权门店");
         }
-        
         StoreSearchDTO searchDTO = new StoreSearchDTO();
         // 上线门店
         searchDTO.setStatus("2");
@@ -223,9 +222,8 @@ public class HmStoreController {
         page.setPageSize(basePageInfo.getPageSize());
         page.setCurrentPage(basePageInfo.getPageNum());
         Map<String, Object> params = new HashMap<>();
-        params.put("searchDto", searchDTO);
         page.setParams(params);
-        logger.info("params:{}", JSON.toJSONString(page));
+        logger.info("查询条件={}", JSON.toJSONString(page));
         Map<String, Object> result = storeService.getStoreListPage(page);
         page = (Page) result.get("page");
         List<StoreDTO> storeList = (List<StoreDTO>)result.get("list");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/StoreVO.java

@@ -38,12 +38,4 @@ public class StoreVO {
     public void setStoreCode(String storeCode) {
         this.storeCode = storeCode;
     }
-
-    public String getKey() {
-        return this.storeId;
-    }
-
-    public String getValue() {
-        return this.storeName;
-    }
 }