From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 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 48f5779..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")
@@ -99,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;
// 缁撴潫鏃堕棿
@@ -112,6 +120,8 @@
private String swiperName;
// 鍒嗙被鍚嶇О
private String className;
+
+ private Integer sex;
public HomeNavbar() {}
@@ -225,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;
}
@@ -280,4 +282,38 @@
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