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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

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

@@ -139,4 +139,12 @@
    */

   public BrandInfoVO listByAlikeName(String key,String platform,String version);





   /**

    * 状态切换

    * @param id

    * @throws BrandInfoException

    */

   public void switchState(Long id) throws BrandInfoException;



}