From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialPlace.java | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialPlace.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialPlace.java
index 8ac8ac5..727906d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialPlace.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialPlace.java
@@ -6,37 +6,25 @@
import org.yeshi.utils.mybatis.Table;
/**
- * 涓撻浣嶇疆绠＄悊
+ * 棣栭〉涓撻浣嶇疆绠＄悊
*
* @author yj
*
- * @date 2018骞�10鏈�23鏃�
+ * @date 2019骞�4鏈�11鏃�
*/
@Table("yeshi_ec_special_place")
public class SpecialPlace {
- // 鍦嗗舰
- public static String SHOWTYPE_ARC = "arc";
- // 鏂瑰潡
- public static String SHOWTYPE_BLOCK = "block";
- // 娲诲姩
- public static String SHOWTYPE_ACTIVITY = "activity";
-
-
@Column(name = "sp_id")
private Long id;
// 浣嶇疆
- @Column(name = "sp_place_name")
- private String placeName;
+ @Column(name = "sp_name")
+ private String name;
// 浣嶇疆鏍囪瘑
@Column(name = "sp_key")
private String key;
-
- // 鑳屾櫙鍥剧墖
- @Column(name = "sp_bottom_picture")
- private String bottomPicture;
// 鍒涘缓鏃堕棿
@Column(name = "sp_create_time")
@@ -45,8 +33,8 @@
// 鏇存柊鏃堕棿
@Column(name = "sp_update_time")
private Date updateTime;
-
+
public Long getId() {
return id;
}
@@ -55,12 +43,12 @@
this.id = id;
}
- public String getPlaceName() {
- return placeName;
+ public String getName() {
+ return name;
}
- public void setPlaceName(String placeName) {
- this.placeName = placeName;
+ public void setName(String name) {
+ this.name = name;
}
public String getKey() {
@@ -86,13 +74,5 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
- public String getBottomPicture() {
- return bottomPicture;
- }
-
- public void setBottomPicture(String bottomPicture) {
- this.bottomPicture = bottomPicture;
- }
-
+
}
--
Gitblit v1.8.0