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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/config/HongBaoManageServiceImpl.java

@@ -352,7 +352,7 @@
      BigDecimal shareRate = getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

            getVIPFanLiRate());

      if (VersionUtil.greaterThan_2_1(platform, version)) {

      if (VersionUtil.greaterThan_2_0_5(platform, version)) {

         paramsDTO.setMaxRewardRate(null);

      }

      return paramsDTO;