From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java
index b89cf98..9ea4244 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java
@@ -17,7 +17,11 @@
 
     private Long storeId;
 
+    private String barcode;
+
     private Integer status;
+
+    private Integer shelfStatus;
 
     private Long categoryId;
 
@@ -31,4 +35,10 @@
     @ApiModelProperty(value = "每页数据量", example = "10")
     private Integer size = 10;
 
+    private Integer limit;
+
+    private String sortColumn;
+
+    private String sortDirection;
+
 }

--
Gitblit v1.9.3