From bf5d1b405c759de3faa42af37b1f10f42823b105 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
index 77df820..0bd8287 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
@@ -55,7 +55,7 @@
 	 * @param state
 	 * @throws BrandClassShopException
 	 */
-	public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top)
+	public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,String key)
 			throws BrandClassShopException;
 	
 	

--
Gitblit v1.8.0