fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java

@@ -41,7 +41,7 @@
    @Resource
    private FollowTraderProfitInfoDao followTraderProfitInfoDao;

    @Scheduled(cron = "0 0/30 * * * ? ")
//    @Scheduled(cron = "0 0/30 * * * ? ")
    public void traderProfitUpdate() {
        log.info("交易员定时任务执行");
        // 查询所有交易员信息