From 0b357d525c83203162eb053aed9c87604156f94a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept'
---
src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
index 0f889a7..c7e389e 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
@@ -1,7 +1,9 @@
package com.mindskip.xzs.viewmodel.admin.user;
import com.mindskip.xzs.domain.User;
+import com.mindskip.xzs.domain.enums.DepartmentExamineEnum;
import com.mindskip.xzs.domain.enums.UserConditionEnum;
+import com.mindskip.xzs.domain.enums.UserConditionExamineEnum;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.viewmodel.BaseVM;
@@ -52,6 +54,46 @@
private String conditionDetail;
+ private List<Integer> deptIdList;
+
+ private String password;
+
+ private DepartmentExamineEnum departmentExamineResult;
+
+ private UserConditionExamineEnum conditionExamineResult;
+
+ public DepartmentExamineEnum getDepartmentExamineResult() {
+ return departmentExamineResult;
+ }
+
+ public void setDepartmentExamineResult(DepartmentExamineEnum departmentExamineResult) {
+ this.departmentExamineResult = departmentExamineResult;
+ }
+
+ public UserConditionExamineEnum getConditionExamineResult() {
+ return conditionExamineResult;
+ }
+
+ public void setConditionExamineResult(UserConditionExamineEnum conditionExamineResult) {
+ this.conditionExamineResult = conditionExamineResult;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public List<Integer> getDeptIdList() {
+ return deptIdList;
+ }
+
+ public void setDeptIdList(List<Integer> deptIdList) {
+ this.deptIdList = deptIdList;
+ }
+
public String getConditionDetail() {
return conditionDetail;
}
@@ -66,6 +108,7 @@
vm.setLastActiveTime(DateTimeUtil.dateFormat(user.getLastActiveTime()));
vm.setCreateTime(DateTimeUtil.dateFormat(user.getCreateTime()));
vm.setModifyTime(DateTimeUtil.dateFormat(user.getModifyTime()));
+ vm.setPassword(null);
return vm;
}
--
Gitblit v1.8.0