From 0fbe4163e855c1537d6f0040b12fa1501a499de0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 六月 2019 09:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 313dd5e..48f5779 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
@@ -18,9 +18,6 @@
@Table("yeshi_ec_home_navbar")
public class HomeNavbar implements Serializable{
- /**
- *
- */
private static final long serialVersionUID = 1L;
public enum NavbarTypeEnum {
@@ -36,7 +33,7 @@
}
}
-
+ @Expose
@Column(name = "br_id")
private Long id;
@@ -85,6 +82,14 @@
// 鐘舵�侊細1鍚敤 0 鍋滅敤
@Column(name = "br_state")
private Integer state;
+
+ // 鏄惁榛樿锛� 0 闈為粯璁� 1 榛樿椤�
+ @Column(name = "br_is_default")
+ private Boolean isDefault;
+
+ // 鍥哄畾椤癸細0 闈炲浐瀹� 1 鍥哄畾
+ @Column(name = "br_is_fixed")
+ private Boolean isFixed;
// 鍒涘缓鏃堕棿
@Column(name = "br_createtime")
@@ -107,6 +112,13 @@
private String swiperName;
// 鍒嗙被鍚嶇О
private String className;
+
+
+ public HomeNavbar() {}
+
+ public HomeNavbar(Long id) {
+ this.id = id;
+ }
public Long getId() {
@@ -253,4 +265,19 @@
this.className = className;
}
+ public Boolean getIsDefault() {
+ return isDefault;
+ }
+
+ public void setIsDefault(Boolean isDefault) {
+ this.isDefault = isDefault;
+ }
+
+ public Boolean getIsFixed() {
+ return isFixed;
+ }
+
+ public void setIsFixed(Boolean isFixed) {
+ this.isFixed = isFixed;
+ }
}
--
Gitblit v1.8.0