Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java

@@ -12,6 +12,9 @@
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;

import javax.xml.crypto.Data;
import java.util.Date;

@Component
public class HistoryTableInsertTask {

@@ -46,7 +49,8 @@
    @XxlJob("insertHistoryDaily")
    public ReturnT insertHistoryDaily() {
        try {
            historyDailyService.insertHistoryDaily();
            Date now = new Date();
            historyDailyService.insertHistoryDaily(null);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return ReturnT.FAIL;