Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae

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

@@ -48,5 +48,9 @@
   @TableField(exist = false)
   private String isCheck;

   @ApiModelProperty(value = "工况运行时长")
   @TableField(exist = false)
   private double operatConditDuration;


}