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/HomeNavbar.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 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 48f5779..e014304 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
@@ -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")
@@ -112,6 +119,8 @@
 	private String swiperName;
 	// 鍒嗙被鍚嶇О
 	private String className;
+	
+	private Integer sex;
 	
 	
 	public HomeNavbar() {}
@@ -280,4 +289,28 @@
 	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;
+	}
 }

--
Gitblit v1.8.0