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 | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 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 62b2298..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) {
@@ -70,6 +70,13 @@
// 鎺掑簭
@Column(name = "br_orderby")
private Integer orderby;
+
+ // 鎺掑簭
+ @Column(name = "br_order_man")
+ private Integer orderMan;
+ // 鎺掑簭
+ @Column(name = "br_order_woman")
+ private Integer orderWoman;
//璧峰鏃堕棿
@Column(name = "br_start_time")
@@ -85,12 +92,11 @@
// 鏄惁榛樿锛� 0 闈為粯璁� 1 榛樿椤�
@Column(name = "br_is_default")
- private Integer isDefault;
+ private Boolean isDefault;
- // 缂栬緫鐘舵�侊細0 鍙紪杈� 1 涓嶅彲缂栬緫
- @Expose
- @Column(name = "br_non_edit")
- private Integer nonEdit;
+ // 鍥哄畾椤癸細0 闈炲浐瀹� 1 鍥哄畾
+ @Column(name = "br_is_fixed")
+ private Boolean isFixed;
// 鍒涘缓鏃堕棿
@Column(name = "br_createtime")
@@ -100,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;
// 缁撴潫鏃堕棿
@@ -113,6 +120,8 @@
private String swiperName;
// 鍒嗙被鍚嶇О
private String className;
+
+ private Integer sex;
public HomeNavbar() {}
@@ -226,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;
}
@@ -266,19 +267,53 @@
this.className = className;
}
- public Integer getIsDefault() {
+ public Boolean getIsDefault() {
return isDefault;
}
- public void setIsDefault(Integer isDefault) {
+ public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault;
}
- public Integer getNonEdit() {
- return nonEdit;
+ public Boolean getIsFixed() {
+ return isFixed;
}
- public void setNonEdit(Integer nonEdit) {
- this.nonEdit = nonEdit;
+ public void setIsFixed(Boolean isFixed) {
+ this.isFixed = isFixed;
}
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public Integer getOrderMan() {
+ return orderMan;
+ }
+
+ public void setOrderMan(Integer orderMan) {
+ this.orderMan = orderMan;
+ }
+
+ public Integer getOrderWoman() {
+ return orderWoman;
+ }
+
+ 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