Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoShopMapper.java

@@ -25,4 +25,15 @@
    * @return
    */
   long countBrandShopinfo(@Param("cid") Long cid);
}



   /**
    * 根据店铺搜索关键词查找
    * @param key
    * @return
    */
   List<TaoBaoShopVO> getShopByKey(@Param("key") String  key);
	
}