Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-29 7b1e6c513da5799fd1e6ed478af785ee8c6b0589

 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java

@@ -190,7 +190,7 @@
                        LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
                                NoticeConstant.RETURN_MONEY_TITLE,
                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
                                        memberDao.selectById(traderInfoEntity.getMemberId()).getInviteId(),
                                        memberEntity.getInviteId(),
                                        orderNo,
                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
                    }