Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandClassShopMapper.java

@@ -25,7 +25,7 @@
    * @param cid
    * @return
    */
   List<BrandClassShop> listEffective(@Param("start") long start, @Param("count") int count, @Param("cid") Long cid);
   List<BrandClassShop> listEffective(@Param("cid") Long cid);
   
   long countEffective(@Param("cid") Long cid);