From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryQueryCriteria.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryQueryCriteria.java
index bc8ae0a..c17c621 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryQueryCriteria.java
@@ -3,6 +3,9 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author lzp
  * @date 2025-04-27
@@ -10,17 +13,28 @@
 @Data
 public class StoreCategoryQueryCriteria {
 
+    @ApiModelProperty(value = "模糊查询")
+    private String blurry;
+
+    @ApiModelProperty(value = "ID")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "店铺ID")
     private Long storeId;
 
+    @ApiModelProperty(value = "类目层级:1-级类目 2-级类目")
     private Integer level;
 
-    private Boolean recursive;
-
+    @ApiModelProperty(value = "是否启用(0-否 1-是)")
     private Integer active;
+
+    @ApiModelProperty(value = "递归处理")
+    private Boolean recursive;
 
     @ApiModelProperty(value = "页码", example = "1")
     private Integer page = 1;
 
     @ApiModelProperty(value = "每页数据量", example = "10")
     private Integer size = 10;
+
 }

--
Gitblit v1.9.3