Merge remote-tracking branch 'origin/master'

jinlin

2023-11-15 43094c8793de5af81904eb49eebacfb76e209fe3

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

@@ -15,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("software_test_order_measured")
public class SoftwareTestOrderMeasured extends DictList  {
public class SoftwareTestOrderMeasured extends BusiEntity {
   private static final long serialVersionUID = 1L;

   @ApiModelProperty(value = "委托单ID")
@@ -33,6 +33,6 @@
   @ApiModelProperty(value = "是否被测件")
   private String isMeasured;



   public SoftwareTestOrderMeasured() {
   }
}