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

xiaoyong931011

2021-04-15 2c967b730b5647663b7bacd817b0a49bbf208dc1

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

@@ -216,6 +216,10 @@
              FollowTraderProfitInfoVo.setDeclaration(declaration);

              Integer isAll = followTraderInfoEntity.getIsAll();

              FollowTraderProfitInfoVo.setIsAll(isAll);



            Date entryTime = followTraderInfoEntity.getEntryTime();

            int datePoor = getDatePoor(entryTime, new Date());

            FollowTraderProfitInfoVo.setEntryDays(datePoor);

              

              String labels = followTraderInfoEntity.getLabels();

              if(StrUtil.isNotEmpty(labels)) {