Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

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

@@ -1,20 +1,21 @@
package com.moral.task;

import java.time.LocalDateTime;

import javax.annotation.Resource;

import com.moral.service.HistoryMinutelyService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import org.springframework.format.datetime.joda.LocalDateTimeParser;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import org.springframework.stereotype.Component;

@Component
public class HistoryMinutelySubTableTask {
    @Resource
    private HistoryMinutelyService historyMinutelyService;
    @XxlJob("createHistoryMinutelyTb")
    public ReturnT createHistoryMinutelyTb(){
    public ReturnT createHistoryMinutelyTb(String param){
        LocalDateTime time=LocalDateTime.now();
        LocalDateTime time1 = time.plusMonths(1);
        String year = String.valueOf(time1.getYear());