From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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 | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 07354cb..94046e1 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
@@ -11,15 +11,14 @@
@Data
public class CancelClassesVO {
/**
- *
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle'},
- {title: '上课门店', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
- {title: '学员姓名', field: 'studentName', visible: true, align: 'center', valign: 'middle'},
- {title: '上课老师', field: 'coachName', visible: true, align: 'center', valign: 'middle'},
- {title: '消课时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
- {title: '课程名称', field: 'courseName', visible: true, align: 'center', valign: 'middle'},
- {title: '上课时间', field: 'startAndEnd', visible: true, align: 'center', valign: 'middle'}
+ * {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ * {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle'},
+ * {title: '上课门店', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
+ * {title: '学员姓名', field: 'studentName', visible: true, align: 'center', valign: 'middle'},
+ * {title: '上课老师', field: 'coachName', visible: true, align: 'center', valign: 'middle'},
+ * {title: '消课时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ * {title: '课程名称', field: 'courseName', visible: true, align: 'center', valign: 'middle'},
+ * {title: '上课时间', field: 'startAndEnd', visible: true, align: 'center', valign: 'middle'}
*/
private Integer id;
private String provinceAndCity;
@@ -31,7 +30,7 @@
// 教练id
private Integer coachId;
// 消课时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date insertTime;
private String courseName;
private String startAndEnd;
--
Gitblit v1.7.1