From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceVO.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceVO.java
index 0ebc023..a118745 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceVO.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceVO.java
@@ -12,20 +12,19 @@
public class IntroduceVO {
/**
* {field: 'selectItem', radio: true},
- * {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle',width:'8%',},
- * {title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:'8%',},
- * {title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:'5%',},
- * {title: '赠送课时数', field: 'giveClass', visible: true, align: 'center', valign: 'middle',width:'8%',},
- * {title: '参与次数', field: 'number', visible: true, align: 'center', valign: 'middle',width:'8%',},
- * {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'8%',
- * {title: '活动状态', field: 'activityState', visible: true, align: 'center', valign: 'middle',width:'8%',
- *
+ * {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle',width:'8%',},
+ * {title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:'8%',},
+ * {title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:'5%',},
+ * {title: '赠送课时数', field: 'giveClass', visible: true, align: 'center', valign: 'middle',width:'8%',},
+ * {title: '参与次数', field: 'number', visible: true, align: 'center', valign: 'middle',width:'8%',},
+ * {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'8%',
+ * {title: '活动状态', field: 'activityState', visible: true, align: 'center', valign: 'middle',width:'8%',
*/
private Integer id;
private String provinceAndCity;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
private Integer giveClass;
private Integer number;
--
Gitblit v1.7.1