From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java
index 8858260..e7a67fa 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java
@@ -72,12 +72,14 @@
*/
@TableField("startTime")
@ApiModelProperty("预约开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 预约结束
*/
@TableField("endTime")
@ApiModelProperty("预约结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 预约人
@@ -101,6 +103,7 @@
*/
@TableField("payTime")
@ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
/**
* 支付金额
@@ -148,6 +151,7 @@
* 取消时间
*/
@TableField("cancelTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date cancelTime;
/**
* 第三方取消退款流水号
@@ -176,4 +180,11 @@
private String halfName;
@TableField("goType")
private Integer goType;
+
+ private String money;
+
+ @TableField(exist = false)
+ private Integer type;
+ @TableField("addType")
+ private Integer addType;
}
--
Gitblit v1.7.1