Merge remote-tracking branch 'origin/master'

xyc

2024-11-07 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9

 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;

}