Merge branch 'lmm' into develop

src/app/views/round-robin/round-robin.component.ts

@@ -559,6 +559,7 @@ export class RoundRobinComponent implements OnInit {
     this.validateForm.controls.executeTime.setValue(new Date(data.executeTime)); //轮巡策略
     this.defaultSelectTimesOption = data.executeTime;
     //轮巡策略(时间) start
+    this.timeStepChange(data.timeStep);
     if (data.timeStep == "year") {
       this.validateForm.controls.doYear.setValue(
         format(data.executeTime, "yyyy-MM-dd HH:mm:ss")