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

admin

2019-11-26 e97065519838a1ebbee870eefae6eae9f5d91647

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

@@ -5,7 +5,6 @@
import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.BrandInfo;
import com.yeshi.fanli.vo.brand.BrandInfoVO;

@@ -71,5 +70,5 @@
    * @return
    */
   long countValidByCidToApp(@Param("cid") Long cid);
	

}