From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandGoodsCaheService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandGoodsCaheService.java
index e1af5bd..2dcef35 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandGoodsCaheService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandGoodsCaheService.java
@@ -14,7 +14,7 @@
  */
 public interface BrandGoodsCaheService {
 
-	public int addBrandGoods(BrandInfo brandInfo);
+	public BrandInfo addBrandGoods(BrandInfo brandInfo);
 
 	/**
 	 * 鏌ヨ鍝佺墝鍟嗗搧

--
Gitblit v1.8.0