From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:42:58 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 a7f230d..6891cc2 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
@@ -19,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 门店id
@@ -61,6 +61,11 @@
*/
@TableField("cityCode")
private String cityCode;
+ /**
+ * 是否可预约（0=否，1=是）
+ */
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
/**
* 预约开始时间
*/
@@ -106,8 +111,12 @@
* 添加时间
*/
@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("operatorId")
+ private Integer operatorId;
+ @TableField("typeName")
+ private String typeName;
@TableField("imgs")
private String imgs;
@TableField("introduce")
@@ -124,7 +133,8 @@
private Double playPaiCoinOne;
@TableField("ids")
private String ids;
- @TableField("typeName")
- private String typeName;
-
+ @TableField("sign")
+ private Integer sign;
+ @TableField("reservation")
+ private Integer reservation;
}
--
Gitblit v1.7.1