Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/java/com/moral/task/HistoryTableDeleteTask.java

@@ -1,18 +1,15 @@
package com.moral.task;

import com.moral.service.HistoryService;
import javax.annotation.Resource;

import com.moral.service.HistoryService;
import com.moral.util.DateUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;

import java.util.Date;

@Component
public class HistoryTableDeleteTask {
@@ -21,7 +18,7 @@
    private HistoryService historyService;

    @XxlJob("deleteOldDate")
    public ReturnT deleteOldData() {
    public ReturnT deleteOldData(String param) {
        String p=DateUtil.getOldTime(8);
        String s=DateUtil.getOldTime(7);
        String[] ss=p.split("-");