Merge remote-tracking branch 'origin/test' into simulation-new-logic
This commit is contained in:
commit
b5c001eacf
@ -77,8 +77,9 @@ public class RunPlanLoadVO {
|
|||||||
this.id = runPlanLoad.getId();
|
this.id = runPlanLoad.getId();
|
||||||
this.mapId = runPlanLoad.getMapId();
|
this.mapId = runPlanLoad.getMapId();
|
||||||
this.templatePlanId = runPlanLoad.getTemplatePlanId();
|
this.templatePlanId = runPlanLoad.getTemplatePlanId();
|
||||||
this.loadTime =runPlanLoad.getLoadTime();
|
this.loadTime = runPlanLoad.getLoadTime();
|
||||||
this.loadRule = BusinessConsts.RunPlanLoadRule.valueOf(runPlanLoad.getLoadRule());
|
if (runPlanLoad.getLoadRule() != null)
|
||||||
|
this.loadRule = BusinessConsts.RunPlanLoadRule.valueOf(runPlanLoad.getLoadRule());
|
||||||
this.userId = runPlanLoad.getUserId();
|
this.userId = runPlanLoad.getUserId();
|
||||||
this.creatorId = runPlanLoad.getCreatorId();
|
this.creatorId = runPlanLoad.getCreatorId();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user