From 5e88359d7210039a6b1525bd5ffc20f24f2b5e01 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 08 五月 2019 16:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..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
@@ -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)
 			throws GoodsSubClassException, Exception;
 
 }

--
Gitblit v1.8.0