From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/dto/UserQueryCriteria.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 81b91f4..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
@@ -4,9 +4,7 @@
import lombok.Data;
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
/**
* @author Z
@@ -18,17 +16,14 @@
@ApiModelProperty(value = "ID")
private Long id;
- @ApiModelProperty(value = "多个ID")
- private Set<Long> deptIds = new HashSet<>();
-
@ApiModelProperty(value = "模糊查询")
private String blurry;
@ApiModelProperty(value = "是否启用")
private Boolean enabled;
- @ApiModelProperty(value = "机构ID")
- private Long deptId;
+ @ApiModelProperty(value = "用户类型")
+ private List<String> userTypes;
@ApiModelProperty(value = "创建时间")
private List<Timestamp> createTime;
--
Gitblit v1.9.3