From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 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