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

admin

2019-09-03 81f4d5a0074dcc0da71ef453e4e02a4d1d7decf5

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

@@ -96,5 +96,13 @@
    * 更新品牌商品

    */

   public void updateShopGoods();



   /**

    * 店铺列表

    * @param page

    * @param cid

    * @return

    */

   public JSONObject listEffectiveCacheV2(int page, Long cid);

   

}