From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
index 3c7b3d4..3e9835b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
@@ -12,15 +12,18 @@
 public class SysUserQuery extends BasePage {
 
     @ApiModelProperty(value = "姓名")
-    private String nickNameOrPhone;
-
-    @ApiModelProperty(value = "角色id")
-    private List<Integer> roleIds;
-
-    @ApiModelProperty(value = "部门id集合")
-    private List<String> deptIds;
-
+    private String nickName;
+    @ApiModelProperty(value = "电话")
+    private String phonenumber;
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+    @ApiModelProperty(value = "角色id 全部不传")
+    private Long roleId;
     @ApiModelProperty(value = "状态  0=正常 1=停用")
     private String status;
+    @ApiModelProperty(value = "引用状态")
+    private String templateId;
+    @ApiModelProperty(value = "用户ids 前端忽略")
+    private List<Long> patrolInspectorIds;
 
 }

--
Gitblit v1.7.1