Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-29 ac208d6f60284be820fe82dfdf44142f02d9e3ef

 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);