From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesVO.java b/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesVO.java
index 2a3cfa2..07354cb 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesVO.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesVO.java
@@ -1,5 +1,6 @@
package com.dsh.course.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -30,7 +31,13 @@
// 教练id
private Integer coachId;
// 消课时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date insertTime;
private String courseName;
private String startAndEnd;
+ private String voucher;
+ private Integer cancelledClassesNumber;
+ private Long coursePackagePaymentId;
+ private Long coursePackageSchedulingId;
+
}
--
Gitblit v1.7.1