Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-04 58ee87fd64efdb75d16e396c3d952d3522c3a747

 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java

@@ -67,4 +67,12 @@
    * @return

    */

   public List<TaoBaoShopVO> getShopByKey(String key);

	
	
   /**

    * 根据店铺搜索关键词查找

    * @param key

    * @return

    */

   public List<TaoBaoShopVO> getShopByKeyV2(String key,String platform,String version);

}