From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
index 41dde4b..ccc170d 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
@@ -65,7 +65,7 @@
* 支付方式（1=免费，2=现金支付，3=玩湃币支付，4=课时支付）
*/
@TableField("payType")
- private Integer payType;
+ private String payType;
/**
* 现金
*/
@@ -101,6 +101,26 @@
*/
@TableField("winIntegral")
private Integer winIntegral;
+ /**
+ * 省
+ */
+ @TableField("province")
+ private String province;
+ /**
+ * 省
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 市
+ */
+ @TableField("city")
+ private String city;
+ /**
+ * 市
+ */
+ @TableField("cityCode")
+ private String cityCode;
/**
* 参赛地址
*/
@@ -152,4 +172,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("createTime")
private Date createTime;
+ /**
+ * 已比赛次数
+ */
+ @TableField("matchNumber")
+ private Integer matchNumber;
}
--
Gitblit v1.7.1