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/impl/brand/BrandClassShopServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index 597b7df..26c4a66 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -126,7 +126,7 @@
@Override
@Transactional
- 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 {
if (id == null) {
@@ -148,7 +148,7 @@
}
// 鑷畾涔夊浘鐗�
- taoBaoShopService.changeInfo(file, shop.getId(), shopName);
+ taoBaoShopService.changeInfo(file, shop.getId(), shopName,key);
BrandClassShop updateshop = new BrandClassShop();
updateshop.setState(state);
--
Gitblit v1.8.0