Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-03 0a63d22e38a644bc83b393ed85618b04d3be858b

 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;