From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
index 02ac610..89ece2b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
@@ -70,5 +70,5 @@
 	 * @return
 	 */
 	long countValidByCidToApp(@Param("cid") Long cid);
-	
+
 }
\ No newline at end of file

--
Gitblit v1.8.0