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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -78,4 +78,16 @@
   
   
   BrandInfo selectByUniqueName(@Param("name") String name, @Param("cid") Long cid, @Param("id") Long id);
	
	
	
   /**
    * 查询返回前端品牌
    * @param start
    * @param count
    * @param cid
    * @return
    */
   List<BrandInfoVO> listByAlikeName(@Param("key") String key);
	
}