diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
index 31ef1c46..ce22ccaf 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
@@ -37,8 +37,8 @@ public class TbProductController {
 
     @PostMapping("/list/v2")
     @ApiOperation("查询商品列表 新")
-    public ResponseEntity<Object> queryTbProductV2(@RequestBody TbProductQueryV2Criteria criteria, Pageable pageable){
-        return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK);
+    public ResponseEntity<Object> queryTbProductV2(@RequestBody TbProductQueryV2Criteria criteria){
+        return new ResponseEntity<>(tbProductService.queryAllV2(criteria),HttpStatus.OK);
     }
 
     @GetMapping("/list")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryV2Criteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryV2Criteria.java
index 48fc19d7..c7065ee5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryV2Criteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryV2Criteria.java
@@ -67,9 +67,9 @@ public class TbProductQueryV2Criteria {
     @Query(type = BETWEEN)
     private List<Long> createdAt;
 
-//    private Integer page;
-//
-//    private Integer size;
+    private Integer page;
+    private Integer size;
+    private String sort;
 
     public void setType(String type) {
         if(StringUtils.isNotBlank(type)){
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 0895dd9a..fe48bb66 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
@@ -241,7 +241,12 @@ public class TbProductServiceImpl implements TbProductService {
     }
 
     @Override
-    public Map<String, Object> queryAllV2(TbProductQueryV2Criteria criteria,Pageable pageable) {
+    public Map<String, Object> queryAllV2(TbProductQueryV2Criteria criteria) {
+        String[] sortParams = criteria.getSort().split(",");
+        String sortField = sortParams[0];
+        Sort.Direction sortDirection = Sort.Direction.fromString(sortParams[1]);
+        Sort sort = Sort.by(sortDirection, sortField);
+        Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getSize(), sort);
         //查询商品数据
         Page<TbProduct> page = tbProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
         Integer warnLine = 0;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
index b54397db..4b556a58 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
@@ -176,6 +176,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
         stockDetail.setUnitName(tbShopUnit==null?"":tbShopUnit.getName());
         stockDetail.setCreatedAt(System.currentTimeMillis());
         stockDetail.setUpdatedAt(System.currentTimeMillis());
+        stockDetail.setOperator(SecurityUtils.getCurrentUsername());
         tbProductStockDetailRepository.save(stockDetail);
         product.setStockNumber(product.getStockNumber()-stockDetail.getStockNumber().intValue());
         tbProductRepository.save(product);
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 027f6da6..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
@@ -31,7 +31,7 @@ public interface TbProductService {
     Map<String, Object> queryAll(TbProductQueryCriteria criteria, boolean isAdmin);
 
 
-    Map<String, Object> queryAllV2(TbProductQueryV2Criteria criteria, Pageable pageable);
+    Map<String, Object> queryAllV2(TbProductQueryV2Criteria criteria);
 
 
     /**