From d3563f0bdb487124d79cdd20d0f8bfc79db31f24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 07 Nov 2025 14:18:08 +0800
Subject: [PATCH] Merge branch 'pxb' into xin

---
 oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java
index b8f13d5..7835b56 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java
@@ -22,6 +22,9 @@
     @ApiModelProperty(value = "是否启用")
     private Boolean enabled;
 
+    @ApiModelProperty(value = "用户类型")
+    private List<String> userTypes;
+
     @ApiModelProperty(value = "创建时间")
     private List<Timestamp> createTime;
 

--
Gitblit v1.9.3