Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -47,7 +47,7 @@
    * @param id

    * @param shopName

    */

   public void changeInfo(MultipartFile file, Long id, String shopName);

   public void changeInfo(MultipartFile file, Long id, String shopName,String key);



   /**

    * 查询店铺信息、并返回钱3个商品数量

@@ -59,5 +59,12 @@
    */

   public List<TaoBaoShopVO> listBrandShopinfo(long start, int count, Long cid);



   long countBrandShopinfo(Long cid);

   public long countBrandShopinfo(Long cid);



   /**

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

    * @param key

    * @return

    */

   public List<TaoBaoShopVO> getShopByKey(String key);

}