From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题

---
 src/main/java/com/mindskip/xzs/domain/vo/UserVO.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 0 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 5d1d64e..059f27b 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
@@ -1,9 +1,12 @@
 package com.mindskip.xzs.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mindskip.xzs.domain.enums.UserConditionEnum;
 import com.mindskip.xzs.utility.excel.ExcelImport;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 public class UserVO implements Serializable {
 
@@ -36,6 +39,7 @@
      */
     private Integer sex;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date birthDay;
 
     /**
@@ -63,10 +67,13 @@
      */
     private String imagePath;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastActiveTime;
 
     /**
@@ -79,6 +86,76 @@
      */
     private String wxOpenId;
 
+    private UserConditionEnum condition;
+
+    private Integer tagId;
+
+    private List<Integer> deptIds;
+
+    private List<Integer> tagIds;
+
+    private List<Integer> excludeTagIds;
+
+    private Integer pageIndex;
+
+    private Integer pageSize;
+
+    public List<Integer> getExcludeTagIds() {
+        return excludeTagIds;
+    }
+
+    public void setExcludeTagIds(List<Integer> excludeTagIds) {
+        this.excludeTagIds = excludeTagIds;
+    }
+
+    public List<Integer> getTagIds() {
+        return tagIds;
+    }
+
+    public void setTagIds(List<Integer> tagIds) {
+        this.tagIds = tagIds;
+    }
+
+    public List<Integer> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(Integer tagId) {
+        this.tagId = tagId;
+    }
+
+    public UserConditionEnum getCondition() {
+        return condition;
+    }
+
+    public void setCondition(UserConditionEnum condition) {
+        this.condition = condition;
+    }
+
     public Integer getId() {
         return id;
     }

--
Gitblit v1.8.0