From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 b153356..313dd5e 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
@@ -2,13 +2,11 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 瀵艰埅绠＄悊
@@ -97,15 +95,19 @@
private Date updatetime;
+
// 鏄惁瀹氭椂
private boolean timeTask;
// 璧峰鏃堕棿
private String startTime_str;
// 缁撴潫鏃堕棿
private String endTime_str;
- // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
+ // 杞挱鍚嶅瓧
+ private String swiperName;
+ // 鍒嗙被鍚嶇О
+ private String className;
+
public Long getId() {
return id;
@@ -235,12 +237,20 @@
this.endTime_str = endTime_str;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
+ public String getSwiperName() {
+ return swiperName;
}
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
+ public void setSwiperName(String swiperName) {
+ this.swiperName = swiperName;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
}
}
--
Gitblit v1.8.0