From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
index 8e18410..01c9d48 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
@@ -26,7 +26,9 @@
// 灞曠ず浣嶇疆 -棣栭〉
public static String POSITION_INDEX = "index";
-
+ // 灞曠ず浣嶇疆 - 娑堟伅涓績
+ public static String POSITION_MSGCENTER = "msgCenter";
+
@Column(name = "fa_id")
private Long id;
@@ -77,6 +79,10 @@
// 鎺掑簭-浼樺厛鏉�
@Column(name = "fa_order")
private Integer order;
+
+ // 閫傜敤绫诲瀷 1鏂颁汉
+ @Column(name = "fa_type")
+ private Integer type;
// 鍚敤鐘舵��
@Column(name = "fa_state")
@@ -224,6 +230,13 @@
public void setEndTime_str(String endTime_str) {
this.endTime_str = endTime_str;
}
-
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
}
--
Gitblit v1.8.0