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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java

@@ -98,6 +98,23 @@
    * @param count

    */

   public void addShopAndGoods(long start, int count);

	
	
	
   /**

    * 检索有效的品牌信息，按更新时间排序

    * @param page

    * @param pageSize

    * @return

    */

   public List<BrandInfo>  listValidOrderByUpdateTime(int page,int pageSize);

	
	
   /**

    * 添加品牌商品

    * @param brandList

    */

   public void addShopAndGoods(List<BrandInfo> brandList);





   public long countValidByCidToApp(Long cid);