From 73372f312e8b8bae98623006640b016f9a433988 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 15:12:49 +0800
Subject: [PATCH] 10.16
---
cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 a7f2055..388c3ca 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -58,7 +59,7 @@
* 门店id
*/
@TableField("storeId")
- private Integer storeId;
+ private String storeId;
/**
* 赛事名称
*/
@@ -68,16 +69,19 @@
* 开始时间
*/
@TableField("startTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 结束时间
*/
@TableField("endTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 报名结束时间
*/
@TableField("registerEndTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date registerEndTime;
/**
* 报名条件（1=全部用户，2=仅限年度会员参与，3=仅限学员参与）
@@ -95,15 +99,20 @@
@TableField("endAge")
private Integer endAge;
/**
- * 支付方式（1=现金，2=玩湃币支付，3=课时支付）
+ * 现金支付价格
*/
- @TableField("payType")
- private Integer payType;
+ @TableField("cashPrice")
+ private Double cashPrice;
/**
- * 支付金额
+ * 玩湃币支付价格
*/
- @TableField("price")
- private BigDecimal price;
+ @TableField("playPaiCoin")
+ private Integer playPaiCoin;
+ /**
+ * 课时支付价格
+ */
+ @TableField("classPrice")
+ private Integer classPrice;
/**
* 参加地址
*/
@@ -218,8 +227,13 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date insertTime;
-
+ /**
+ * 运营商ID
+ */
+ @TableField("operatorId")
+ private Integer operatorId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1