Merge remote-tracking branch 'origin/div' into div

admin

2020-02-28 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0

 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);

}