From 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 07 Aug 2025 15:57:07 +0800
Subject: [PATCH] Merge branch 'master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java |    8 ++++++++
 1 files changed, 8 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 c0db31f..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
@@ -21,9 +21,13 @@
 
     private Integer status;
 
+    private Integer shelfStatus;
+
     private Long categoryId;
 
     private Long secondCategoryId;
+
+    private Integer active;
 
     @ApiModelProperty(value = "页码", example = "1")
     private Integer page = 1;
@@ -33,4 +37,8 @@
 
     private Integer limit;
 
+    private String sortColumn;
+
+    private String sortDirection;
+
 }

--
Gitblit v1.9.3