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

yujian

2019-08-23 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91

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