From 559e188de93bb05d6c37ec1a0d392ec69ed02567 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 10:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
index 4707dfb..5eb1e52 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.web.multipart.MultipartFile;
+
 import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
 
 /**
@@ -29,14 +31,14 @@
 	 * @param list
 	 * @return
 	 */
-	int deleteBatchByPrimaryKey(List<Long> list);
+	public int deleteBatchByPrimaryKey(List<Long> list);
 	
 	/**
 	 * 鑾峰彇鏈�澶х殑鎺掑簭鍊�
 	 * @param card
 	 * @return
 	 */
-	int getMaxOrder();
+	public int getMaxOrder();
 	
 	/**
 	 * 鏌ヨ浜ゆ崲鎺掑簭瀵硅薄
@@ -44,7 +46,7 @@
 	 * @param order 鎺掑簭鍊�
 	 * @return
 	 */
-	List<HomeNavbar> getChangeOrder(Long id, Integer type, Integer order);
+	public List<HomeNavbar> getChangeOrder(Integer type, Integer order);
 	
 	/**
 	 * 鍚庣鍒楄〃鏌ヨ
@@ -53,8 +55,16 @@
 	 * @param key
 	 * @return
 	 */
-	List<HomeNavbar> listQuery(long start, int count, String key);
+	public List<HomeNavbar> listQuery(long start, int count, String key);
 	
-	long countlistQuery(String key);
+	public long countlistQuery(String key);
+
+	/**
+	 * 鍥剧墖涓婁紶
+	 * @param file
+	 * @param homeNavbar
+	 * @throws Exception
+	 */
+	public void uploadPicture(MultipartFile file, HomeNavbar homeNavbar) throws Exception;
 
 }

--
Gitblit v1.8.0