From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +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, 14 insertions(+), 3 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 ca87875..9399be5 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
@@ -106,8 +106,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")
@@ -118,5 +122,12 @@
private String nextName;
@TableField("halfName")
private String halfName;
-
+ @TableField("cashPriceOne")
+ private Double cashPriceOne;
+ @TableField("playPaiCoinOne")
+ private Double playPaiCoinOne;
+ @TableField("ids")
+ private String ids;
+ @TableField("sign")
+ private Integer sign;
}
--
Gitblit v1.7.1