Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 595d363f3736e10354ffe5133a63e67602fa3119

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

@@ -61,4 +61,7 @@
   @TableField(exist = false)
   private Long iid;

   @TableField(exist = false)
   private String content;

}