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/admin/HotSearchAdmin.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/HotSearchAdmin.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/HotSearchAdmin.java
index 0bf8e8a..760589e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/HotSearchAdmin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/HotSearchAdmin.java
@@ -4,11 +4,12 @@
 import java.util.List;
 
 import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 
 public class HotSearchAdmin {
+	
 	private HotSearch hotSearch;
-	private final List<System> systemList=new ArrayList<System>();
+	private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();
 	
 	public HotSearchAdmin() {
 	}
@@ -26,7 +27,7 @@
 		this.hotSearch = hotSearch;
 	}
 
-	public List<System> getSystemList() {
+	public List<BusinessSystem> getSystemList() {
 		return systemList;
 	}
 	

--
Gitblit v1.8.0