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

yujian

2019-06-25 bcbd93bb2239423aecba4e93ffba2e96ab873390

 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java

@@ -55,7 +55,7 @@
    * @param state

    * @throws BrandClassShopException

    */

   public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top)

   public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,String key)

         throws BrandClassShopException;

   

   

@@ -91,4 +91,10 @@
    */

   public void deleteBatchByClassId(List<Long> list);

   

	
   /**

    * 更新品牌商品

    */

   public void updateShopGoods();

	
}