From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 3727f0a..5b12765 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,10 +12,10 @@
public class SysUserQuery extends BasePage {
@ApiModelProperty(value = "姓名")
- private String nickNameAndPhone;
+ private String nickNameOrPhone;
@ApiModelProperty(value = "角色id")
- private Integer roleId;
+ private List<Integer> roleIds;
@ApiModelProperty(value = "部门id集合")
private List<String> deptIds;
@@ -23,4 +23,7 @@
@ApiModelProperty(value = "状态 0=正常 1=停用")
private String status;
+ @ApiModelProperty(value = "营业部id",hidden = true)
+ private String businessDeptId;
+
}
--
Gitblit v1.7.1