diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java
index ea4e36df..7a6dda61 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java
@@ -25,4 +25,7 @@ public class YxStoreProductQueryCriteria{
 
     @Query
     private Integer isShow;
+
+    @Query
+    private Integer cateId;
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
index ab63249d..c9662db5 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
@@ -77,7 +77,14 @@ public class StoreProductController {
     @GetMapping(value = "/yxStoreProduct")
     @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_SELECT')")
     public ResponseEntity getYxStoreProducts(YxStoreProductQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(yxStoreProductService.queryAll(criteria,pageable),HttpStatus.OK);
+        //商品分类
+        List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
+                .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
+                .list();
+        List<Map<String,Object>> cateList = new ArrayList<>();
+        Map<String, Object> queryAll = yxStoreProductService.queryAll(criteria, pageable);
+        queryAll.put("cateList", this.makeCate(storeCategories,cateList,0,1));
+        return new ResponseEntity<>(queryAll,HttpStatus.OK);
     }
 
     @ForbidSubmit