diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 2f0db743..803689f2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -56,11 +56,10 @@ public class TbPlaceController {
     @ApiOperation("查询/product")
     public ResponseEntity<Object> queryActivateTbProductInfo(@RequestParam(defaultValue = "0") Integer page,
                                                              @RequestParam(defaultValue = "30") Integer size,
-                                                             @RequestParam(required = false) String typeEnum,
                                                              @RequestParam(required = false) Integer categoryId,
                                                              @RequestParam Integer shopId,
                                                              @RequestParam(required = false) Integer productId) {
-        return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId, typeEnum), HttpStatus.OK);
+        return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId), HttpStatus.OK);
     }
 
     public TbPlaceController(TbShopTableService tbShopTableService, TbProductService tbProductService, RabbitMsgUtils rabbitMsgUtils) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index cd0f305a..a694e328 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -758,11 +758,11 @@ public class TbProductServiceImpl implements TbProductService {
     }
 
     @Override
-    public Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId, String typeEnum) {
+    public Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<TbProduct> page1 = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
         QueryWrapper<TbProduct> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_del", 0)
-                .eq("type_enum", typeEnum)
+                .in("type_enum", "sku", "normal")
                 .eq("shop_id", shopId)
                 .eq("is_delete", 0)
                 .eq("status", 1)
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
index 68378892..82661bc2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
@@ -106,5 +106,5 @@ public interface TbProductService {
      */
     void returnStockByPro(Integer productId, Integer productSkuId, Integer num);
 
-    Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId, String typeEnum);
+    Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId);
 }