From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
index f855e9c..89ba6eb 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
@@ -1,15 +1,14 @@
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.Classes;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
+
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -26,23 +25,28 @@
/** 鍒涘缓浜� */
private Integer createUser;
+ private String createUserName;
+ private String teacherPhone;
/** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 鐝骇浜烘暟 */
private Integer classesNumber;
/** 鐝骇鐘舵�� */
- private String status;
+ private ClassesStatusEnum status;
/** 楠岃瘉鐘舵�� */
private String verifyStatus;
/** 寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/** 澶囨敞 */
--
Gitblit v1.8.0