Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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;