From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
index f5527a8..f2bffa4 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
@@ -9,6 +9,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @author zhibing.pu
@@ -163,7 +164,7 @@
* 添加时间
*/
@TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
@TableField("nextName")
@ApiModelProperty("场地名称")
@@ -176,4 +177,14 @@
private String halfName;
@TableField("goType")
private Integer goType;
+ @TableField("money")
+ private String money;
+ @TableField(exist = false)
+ private String storePhone;
+ @TableField(exist = false)
+ private List<Integer> sid;
+ @TableField(exist = false)
+ private List<Integer> rid;
+ @TableField("addType")
+ private Integer addType;
}
--
Gitblit v1.7.1