From fff73372b4b443d2920f09d2e83702fec07521a6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 22 五月 2024 12:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/UserVO.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 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..05de999 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,67 @@
*/
private String wxOpenId;
+ private UserConditionEnum condition;
+
+ private String conditionDetail;
+
+ private Integer tagId;
+
+ private List<Integer> deptIds;
+
+ private Integer pageIndex;
+
+ private Integer pageSize;
+
+ 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 String getConditionDetail() {
+ return conditionDetail;
+ }
+
+ public void setConditionDetail(String conditionDetail) {
+ this.conditionDetail = conditionDetail;
+ }
+
+ public UserConditionEnum getCondition() {
+ return condition;
+ }
+
+ public void setCondition(UserConditionEnum condition) {
+ this.condition = condition;
+ }
+
public Integer getId() {
return id;
}
--
Gitblit v1.8.0