Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 e4246536ec8218b0444667cbe457c0d3d6e67bd9

 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;

}