From 79c1cc71dfcf2ac2a96433439507e582b7bf23e2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 九月 2025 09:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 5b12765..ae8c97a 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,7 +12,9 @@
public class SysUserQuery extends BasePage {
@ApiModelProperty(value = "姓名")
- private String nickNameOrPhone;
+ private String nickName;
+ @ApiModelProperty(value = "电话")
+ private String phonenumber;
@ApiModelProperty(value = "角色id")
private List<Integer> roleIds;
@@ -23,7 +25,6 @@
@ApiModelProperty(value = "状态 0=正常 1=停用")
private String status;
- @ApiModelProperty(value = "营业部id",hidden = true)
- private String businessDeptId;
-
+ @ApiModelProperty(value = "角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员 前端忽略")
+ private Integer roleType;
}
--
Gitblit v1.7.1