From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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
new file mode 100644
index 0000000..3c7b3d4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
@@ -0,0 +1,26 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "账户列表query")
+public class SysUserQuery extends BasePage {
+
+ @ApiModelProperty(value = "姓名")
+ private String nickNameOrPhone;
+
+ @ApiModelProperty(value = "角色id")
+ private List<Integer> roleIds;
+
+ @ApiModelProperty(value = "部门id集合")
+ private List<String> deptIds;
+
+ @ApiModelProperty(value = "状态 0=正常 1=停用")
+ private String status;
+
+}
--
Gitblit v1.7.1