From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
index 8fe36d4..f116047 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
@@ -59,7 +59,7 @@
* 门店id
*/
@TableField("storeId")
- private Integer storeId;
+ private String storeId;
/**
* 赛事名称
*/
@@ -69,18 +69,19 @@
* 开始时间
*/
@TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date endTime;
/**
* 报名结束时间
*/
@TableField("registerEndTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date registerEndTime;
/**
* 报名条件（1=全部用户，2=仅限年度会员参与，3=仅限学员参与）
@@ -226,9 +227,16 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
-
-
+ /**
+ * 运营商ID
+ */
+ @TableField("operatorId")
+ private Integer operatorId;
+ // 已报名人数
+ @TableField(exist = false)
+ private String count;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1