From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java |    3 +--
 1 files changed, 1 insertions(+), 2 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 89f4ccb..66d7515 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,6 @@
 
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
-import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;
 import com.yeshi.fanli.exception.GoodsSubClassException;
 
 
@@ -124,7 +123,7 @@
 	 * @throws GoodsSubClassException
 	 * @throws Exception
 	 */
-	public void saveObject(MultipartFile file,MultipartFile file2,  GoodsSubClass record, Integer type, Long pid,GoodsSubClassLabelMap labelMap)
+	public void saveObject(MultipartFile file,MultipartFile file2,  GoodsSubClass record, Integer type, Long pid)
 			throws GoodsSubClassException, Exception;
 
 }

--
Gitblit v1.8.0