Merge remote-tracking branch 'origin/master'

rk

18 小时以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java

@@ -91,7 +91,7 @@
                if(StringUtils.isNotBlank(inviteRecord.getImgUrl())){
                    inviteRecord.setImgUrl(path + inviteRecord.getImgUrl());
                }
                num = num.add(inviteRecord.getRewardIntegral()).add(inviteRecord.getFirstRewardIntegral());
                num = num.add(inviteRecord.getRewardIntegral());
            }
            inviteInfoResponse.setNum(num.longValue());
        }