From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +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/brand/BrandShopCaheService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandShopCaheService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandShopCaheService.java
index ae06c1c..3912ad1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandShopCaheService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandShopCaheService.java
@@ -42,7 +42,7 @@
 	 * 娣诲姞鎷煎澶氬簵閾�
 	 * @param brandInfo
 	 */
-	public void addBrandShopPDD(BrandInfo brandInfo);
+	public int addBrandShopPDD(BrandInfo brandInfo);
 
 	/**
 	 * 鍒犻櫎涔嬪墠鐨�

--
Gitblit v1.8.0