From ea3bcc24543202a55b22623cad8dd8900d550242 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 14:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/ClassesUserVO.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ClassesUserVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ClassesUserVO.java
index cfdb39e..01f6df1 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ClassesUserVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ClassesUserVO.java
@@ -1,10 +1,12 @@
package com.ycl.jxkg.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.ClassesUser;
import java.util.Date;
import java.util.List;
+
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -20,26 +22,49 @@
@Data
public class ClassesUserVO extends AbsVo {
- /** 鐝骇ID */
+ /**
+ * 鐝骇ID
+ */
private Integer classesId;
- /** 鐢ㄦ埛ID */
+ /**
+ * 鐢ㄦ埛ID
+ */
private Integer userId;
- /** 鐪熷疄濮撳悕 */
+ /**
+ * 鐪熷疄濮撳悕
+ */
private String realName;
- /** 骞撮緞 */
+ /**
+ * 骞撮緞
+ */
private Integer sex;
- /** 鐢佃瘽 */
+ /**
+ * 鐢佃瘽
+ */
private String phone;
- /** 鍔犲叆鏃堕棿 */
+ /**
+ * 鍔犲叆鏃堕棿
+ */
private Date createTime;
+ /**
+ * 鐢佃瘽
+ */
+ private String userName;
+ /**
+ * 鐢佃瘽
+ */
+ private String age;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+ private Integer status;
public static ClassesUserVO getVoByEntity(@NonNull ClassesUser entity, ClassesUserVO vo) {
- if(vo == null) {
+ if (vo == null) {
vo = new ClassesUserVO();
}
BeanUtils.copyProperties(entity, vo);
--
Gitblit v1.8.0