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

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java

@@ -580,7 +580,7 @@
   

   @Override

   public List<TaoBaoShop> listEffectiveClassShop(Long cid) {

      if (cid == null && cid <= 0)

      if (cid == null)

         return null;

      

      List<BrandClassShop> list = brandClassShopMapper.listEffective(cid);