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/taobao/TaoBaoShopMapper.java |   78 +++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoShopMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoShopMapper.java
index 1cabf3e..011ecb1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoShopMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoShopMapper.java
@@ -1,39 +1,39 @@
-package com.yeshi.fanli.dao.mybatis.taobao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.taobao.TaoBaoShop;
-import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
-
-public interface TaoBaoShopMapper extends BaseMapper<TaoBaoShop> {
-	
-	/**
-	 * 鏍规嵁鍒嗙被鏌ヨ搴楅摵淇℃伅銆佸悓鏃惰繑鍥炲晢鍝�
-	 * @param start
-	 * @param count
-	 * @param cid
-	 * @return
-	 */
-	List<TaoBaoShopVO> listBrandShopinfo(@Param("start") long start, @Param("count") int count, @Param("cid") Long cid);
-	
-	/**
-	 * 缁熻锛氬垎绫荤粺骞跺晢鍝佹暟閲忓ぇ浜�3
-	 * @param cid
-	 * @return
-	 */
-	long countBrandShopinfo(@Param("cid") Long cid);
-
-
-
-	/**
-	 * 鏍规嵁搴楅摵鎼滅储鍏抽敭璇嶆煡鎵�
-	 * @param key
-	 * @return
-	 */
-	List<TaoBaoShopVO> getShopByKey(@Param("key") String  key);
-	
-}
-
+package com.yeshi.fanli.dao.mybatis.taobao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
+
+public interface TaoBaoShopMapper extends BaseMapper<TaoBaoShop> {
+	
+	/**
+	 * 鏍规嵁鍒嗙被鏌ヨ搴楅摵淇℃伅銆佸悓鏃惰繑鍥炲晢鍝�
+	 * @param start
+	 * @param count
+	 * @param cid
+	 * @return
+	 */
+	List<TaoBaoShopVO> listBrandShopinfo(@Param("start") long start, @Param("count") int count, @Param("cid") Long cid);
+	
+	/**
+	 * 缁熻锛氬垎绫荤粺骞跺晢鍝佹暟閲忓ぇ浜�3
+	 * @param cid
+	 * @return
+	 */
+	long countBrandShopinfo(@Param("cid") Long cid);
+
+
+
+	/**
+	 * 鏍规嵁搴楅摵鎼滅储鍏抽敭璇嶆煡鎵�
+	 * @param key
+	 * @return
+	 */
+	List<TaoBaoShopVO> getShopByKey(@Param("key") String  key);
+	
+}
+

--
Gitblit v1.8.0