From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/UserVO.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java b/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
index 05de999..ede11cd 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
@@ -88,8 +88,6 @@
private UserConditionEnum condition;
- private String conditionDetail;
-
private Integer tagId;
private List<Integer> deptIds;
@@ -128,15 +126,6 @@
public void setTagId(Integer tagId) {
this.tagId = tagId;
- }
-
-
- public String getConditionDetail() {
- return conditionDetail;
- }
-
- public void setConditionDetail(String conditionDetail) {
- this.conditionDetail = conditionDetail;
}
public UserConditionEnum getCondition() {
--
Gitblit v1.8.0