Merge remote-tracking branch 'origin/master'

zzw

2023-11-17 40eb98bcf3028ca1de391ac140f44920eddd9e8b

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java

@@ -226,10 +226,6 @@
   String criticalLevelStr;

   @TableField(exist = false)
   @ApiModelProperty(value = "是否被测件字符串")
   String isMeasuredStr;

   @TableField(exist = false)
   @ApiModelProperty(value = "软件类型字符串")
   String sortwareTypeStr;