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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

}