新增仓库列表不分页接口

fs-admin/src/main/java/com/fs/store/controller/FsWarehousesController.java

@@ -46,6 +46,17 @@ public class FsWarehousesController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询仓库列表-不分页
+     */
+    @PreAuthorize("@ss.hasPermi('system:warehouses:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(FsWarehouses fsWarehouses)
+    {
+        List<FsWarehouses> list = fsWarehousesService.selectFsWarehousesList(fsWarehouses);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出仓库列表
      */

fs-service-system/src/main/java/com/fs/store/param/FsStoreProductAddEditParam.java

@@ -1,5 +1,6 @@
 package com.fs.store.param;
 
+import com.fs.common.annotation.Excel;
 import com.fs.store.domain.FsStoreProductAttrValue;
 import com.fs.store.dto.ProductArrtDTO;
 import lombok.Data;
@@ -10,7 +11,7 @@ import java.util.List;
 
 /**
  * 商品对象 fs_store_product
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
@@ -136,6 +137,15 @@ public class FsStoreProductAddEditParam implements Serializable
 
     private Integer tuiCateId;
 
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+    /**
+     * 仓库代码
+     */
+    private String warehouseCode;
+
     //属性项目
     private List<ProductArrtDTO> items;
     //sku结果集

fs-service-system/src/main/java/com/fs/store/service/impl/FsWarehousesServiceImpl.java

@@ -1,7 +1,9 @@
 package com.fs.store.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fs.store.domain.FsWarehouses;
 import com.fs.store.mapper.FsWarehousesMapper;
 import com.fs.store.service.IFsWarehousesService;