From 4ede780dd7885f31bcaadfe48224f1da73b763ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 五月 2019 15:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerV2Admin.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerV2Admin.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerV2Admin.java
index 753ebdd..5978b6e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerV2Admin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendBannerV2Admin.java
@@ -4,11 +4,12 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
+import com.yeshi.fanli.entity.system.BusinessSystem;
public class RecommendBannerV2Admin {
private RecommendBannerV2 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 RecommendBannerV2Admin() {
}
@@ -26,7 +27,7 @@
this.recommendBanner = recommendBanner;
}
- public List<com.yeshi.fanli.entity.system.System> getSystemList() {
+ public List<BusinessSystem> getSystemList() {
return systemList;
}
--
Gitblit v1.8.0