From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerAdmin.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerAdmin.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerAdmin.java
index 96178fe..416039a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerAdmin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerAdmin.java
@@ -4,11 +4,12 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
+import com.yeshi.fanli.entity.system.BusinessSystem;
public class RecommendBannerAdmin {
private RecommendBanner recommendBanner;
- private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();
+ private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();
public RecommendBannerAdmin() {
// TODO Auto-generated constructor stub
@@ -23,7 +24,7 @@
public void setRecommendBanner(RecommendBanner recommendBanner) {
this.recommendBanner = recommendBanner;
}
- public List<com.yeshi.fanli.entity.system.System> getSystemList() {
+ public List<BusinessSystem> getSystemList() {
return systemList;
}
--
Gitblit v1.8.0