Commit 0f071701 by huangfusuper

修改冲突

parent e9927964
...@@ -65,7 +65,7 @@ public class DefaultRemainingOperationsCallBack implements RemainingOperationsCa ...@@ -65,7 +65,7 @@ public class DefaultRemainingOperationsCallBack implements RemainingOperationsCa
javaTask.setJobName(jobName); javaTask.setJobName(jobName);
javaTask.setAlarmEmail(email); javaTask.setAlarmEmail(email);
javaTask.setCron(cron); javaTask.setCron(cron);
javaTask.setSchedulingCount(schedulingCount); javaTask.setRepeatCount(schedulingCount);
javaTask.setTaskName(taskName); javaTask.setTaskName(taskName);
javaTask.setAlarmlAction(alarmlAction); javaTask.setAlarmlAction(alarmlAction);
return javaTask; return javaTask;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment