From c5cb162b5cbdb589e97290fba3ac3e9241ec48d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 15:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 9 +++++++--
1 files changed, 7 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 f6810d7..6d9a773 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
@@ -64,12 +64,12 @@
* 预约开始时间
*/
@TableField("appointmentStartTime")
- private Date appointmentStartTime;
+ private String appointmentStartTime;
/**
* 预约结束时间
*/
@TableField("appointmentEndTime")
- private Date appointmentEndTime;
+ private String appointmentEndTime;
/**
* 现金价格（x/半小时）
*/
@@ -100,5 +100,10 @@
*/
@TableField("state")
private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
}
--
Gitblit v1.7.1