From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java
index a753ea3..24afea2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java
@@ -7,7 +7,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
-import com.yeshi.fanli.exception.GoodsSubClassException;
+import com.yeshi.fanli.exception.goods.GoodsSubClassException;
public interface GoodsSubClassService {
@@ -71,7 +71,7 @@
* @return
* @throws Exception
*/
- public List<GoodsSubClass> getGoodsSecondClass(Long rootId, Integer state) throws Exception;
+ public List<GoodsSubClass> getGoodsSecondClass(Long rootId, Integer state,Integer month) throws Exception;
public List<GoodsSubClass> queryByRootIdAndWeight(Long rootId, int type, int weight) throws Exception;
@@ -89,7 +89,7 @@
* @return
* @throws Exception
*/
- public List<GoodsSubClass> getSubClassCache(Long rootId, Integer state) throws Exception;
+ public List<GoodsSubClass> getSubClassCache(Long rootId, Integer state,Integer month) throws Exception;
/**
* 缁熻鍓嶇 鐐瑰嚮娆℃暟
@@ -123,7 +123,7 @@
* @throws GoodsSubClassException
* @throws Exception
*/
- public void saveObject(MultipartFile file, GoodsSubClass record, Integer type, Long pid)
+ public void saveObject(MultipartFile file,MultipartFile file2, GoodsSubClass record, Integer type, Long pid,Long labelId)
throws GoodsSubClassException, Exception;
}
--
Gitblit v1.8.0