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

xiaoyong931011

2021-04-16 17b569ed8554e755c9e5feedf6e7882cdf2c8d01

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -161,6 +161,7 @@
        FollowTraderProfitInfoEntity followTraderProfitInfoEntity = new FollowTraderProfitInfoEntity();

        if(FollowTraderInfoEntity.IS_SETFRIST_Y.equals(type)) {

           followTraderProfitInfoEntity.setType(type);

         followTraderProfitInfoEntity.setTotalProfitRatioSc(2);

        }else {

           String nicknameDto = recordsPageDto.getNickname();

           followTraderProfitInfoEntity.setNickname(nicknameDto);