刘俊驰 hai 1 ano
pai
achega
7ceb4c68b9

+ 3 - 2
mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/OpenController.java

@@ -158,7 +158,8 @@ public class OpenController {
     @ApiOperation("分页获取所有商品属性分类")
     @RequestMapping(value = "productAttribute/category/list", method = RequestMethod.GET)
     public List<PmsProductAttributeCategory> getProductAttributeCategoryList() {
-        List<PmsProductAttributeCategory> productAttributeCategoryList = productAttributeCategoryService.getList(1, 99999);
-        return productAttributeCategoryList;
+        List<PmsProductAttributeCategory> productAttributeCategoryList = productAttributeCategoryService.getList(9999, 1);
+        CommonPage<PmsProductAttributeCategory> pmsProductAttributeCategoryCommonPage = CommonPage.restPage(productAttributeCategoryList);
+        return pmsProductAttributeCategoryCommonPage.getList();
     }
 }

+ 2 - 2
mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/wrapper/PmsProductSkuStockRecordWrapper.java

@@ -83,7 +83,7 @@ public class PmsProductSkuStockRecordWrapper {
          */
         @ApiModelProperty("商品skuId")
         @NotNull(message = "商品skuId不能为空")
-        @ExcelIgnore
+        @ExcelProperty(value = "sku编号",order = 3)
         private Long productSkuId;
 
 
@@ -91,7 +91,7 @@ public class PmsProductSkuStockRecordWrapper {
          * 商品skuId
          */
         @ApiModelProperty("商品sku编号")
-        @ExcelProperty(value = "sku编号",order = 3)
+        @ExcelIgnore
         private String productSkuCode;
 
         /**