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

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

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

@@ -426,7 +426,7 @@


      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

      ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

      List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();

      for (int i = 0; i < list.size(); i++) {

         BrandInfoVO brand = list.get(i);