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/service/inter/goods/GoodsClassService.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
index 8dab207..1abaed0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
@@ -5,7 +5,6 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-import com.yeshi.fanli.entity.admin.GoodsClassAdmin;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.exception.GoodsClassException;
 
@@ -15,9 +14,6 @@
 	
 	
 	public GoodsClass getGoodsClassCache(long gcid);
-
-
-	public int getCount(String platform, String packages, String key);
 
 
 	/**
@@ -51,7 +47,7 @@
 	public void removePicture(GoodsClass record) throws Exception;
 	
 	
-	public List<GoodsClass> queryAll(String platform, String packages) throws Exception;
+	public List<GoodsClass> listquery() throws Exception;
 	
 
 
@@ -70,12 +66,12 @@
 
 
 	/**
-	 *    鏍规嵁绯荤粺ID鏌ヨ鎵�鏈夊垎绫�-鍔犲叆缂撳瓨
+	 *  鏌ヨ鎵�鏈夋湁鏁堝垎绫�-鍔犲叆缂撳瓨
 	 * @param systemId 绯荤粺ID
 	 * @return
 	 * @throws Exception
 	 */
-	public List<GoodsClass> getListClassCache(Long systemId) throws Exception;
+	public List<GoodsClass> getEffectiveClassCache() throws Exception;
 
 	/**
 	 * 鏌ヨ鎵�鏈夊垎绫汇�佷富瀛愮被鐩�
@@ -83,7 +79,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> getClassListAllCache(Long systemId) throws Exception;
+	public List<Map<String, Object>> getClassListAllCache(boolean changePicture) throws Exception;
 
 
 	/**

--
Gitblit v1.8.0