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

admin

2020-03-08 1bcbc66438458a1393591c933243e94f47b7acd2

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java

@@ -173,6 +173,8 @@
            BigDecimal shareRate = hongBaoManageService.getShareRate();

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

                  hongBaoManageService.getVIPFanLiRate());

				
				
            for (UserShareGoodsGroup goodsGroup : list) {

               CommonGoods commonGoods = goodsGroup.getCommonGoods();

               if (commonGoods == null) {