From b87239353afdc0c9502e81961249d527dd8ad54e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 15:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java |   22 ++++++++++++++++++++++
 1 files changed, 22 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 ca26641..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;
 
@@ -56,6 +58,26 @@
 
     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;
     }

--
Gitblit v1.8.0