From 8f20b8b0442e484220352455addc8c2e6945b153 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 六月 2024 16:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
index 657f4d6..3b9cdf7 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
@@ -27,12 +27,13 @@
/** 浼氳灏侀潰 */
private String meetCover;
- /** 瀛︾敓id */
+ /** 鐝骇id */
private Integer classesId;
/** 鍒涘缓浜� */
private Integer createUser;
-
+ /** 鑰佸笀濮撳悕 */
+ private String teacherName;
/** 寮�濮嬫椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -44,6 +45,7 @@
/** 鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉� */
private Integer status;
+
public static MeetVO getVoByEntity(@NonNull Meet entity, MeetVO vo) {
if(vo == null) {
vo = new MeetVO();
--
Gitblit v1.8.0