Merge remote-tracking branch 'origin/master'

xyc

2024-10-15 ada810aa38609da55b0f348b86cc8a8d8ace0efb

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java

@@ -65,7 +65,4 @@

   @ApiModelProperty(value = "备注")
   private String remark;

   private Integer sort;

}