Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-06-28 efd1fc017b6fa5edd71d5f787e1b75b19b2c5f1d

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

@@ -36,7 +36,7 @@
    public void execute(JobExecutionContext context) throws JobExecutionException

    {

        SysJob sysJob = new SysJob();

        BeanUtil.copyProperties(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));

        BeanUtil.copyProperties(context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES),sysJob);

        try

        {

            before(context, sysJob);