From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index ab00eb1..ca87875 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -64,12 +65,12 @@
* 预约开始时间
*/
@TableField("appointmentStartTime")
- private Date appointmentStartTime;
+ private String appointmentStartTime;
/**
* 预约结束时间
*/
@TableField("appointmentEndTime")
- private Date appointmentEndTime;
+ private String appointmentEndTime;
/**
* 现金价格（x/半小时）
*/
@@ -84,6 +85,7 @@
* 场地责任险有效期
*/
@TableField("insuranceEndTime")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date insuranceEndTime;
/**
* 场地责任险图片
@@ -104,6 +106,17 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date insertTime;
+ @TableField("imgs")
+ private String imgs;
+ @TableField("introduce")
+ private String introduce;
+ @TableField("ishalf")
+ private Integer ishalf;
+ @TableField("nextName")
+ private String nextName;
+ @TableField("halfName")
+ private String halfName;
}
--
Gitblit v1.7.1