From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
index e014304..9ce28aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
@@ -21,7 +21,7 @@
private static final long serialVersionUID = 1L;
public enum NavbarTypeEnum {
- category("鍒嗙被"), weex("闃块噷鐧惧窛"), web("缃戦〉");
+ category("鍒嗙被"), weex("闃块噷鐧惧窛"), web("缃戦〉") , commonTemplate("閫氱敤妯℃澘");
private final String desc;
private NavbarTypeEnum(String desc) {
@@ -106,10 +106,11 @@
@Column(name = "br_updatetime")
private Date updatetime;
+ // 璺宠浆鍙傛暟 json 瀛楃涓�
+ @Expose
+ @Column(name = "br_params")
+ private String params;
-
- // 鏄惁瀹氭椂
- private boolean timeTask;
// 璧峰鏃堕棿
private String startTime_str;
// 缁撴潫鏃堕棿
@@ -234,14 +235,6 @@
this.state = state;
}
- public boolean isTimeTask() {
- return timeTask;
- }
-
- public void setTimeTask(boolean timeTask) {
- this.timeTask = timeTask;
- }
-
public String getStartTime_str() {
return startTime_str;
}
@@ -313,4 +306,14 @@
public void setOrderWoman(Integer orderWoman) {
this.orderWoman = orderWoman;
}
+
+
+ public String getParams() {
+ return params;
+ }
+
+ public void setParams(String params) {
+ this.params = params;
+ }
+
}
--
Gitblit v1.8.0