Merge remote-tracking branch 'origin/master'

zzw

2023-11-16 fbdc3cb5768e3484648edf3ff96df03c881e78fa

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

@@ -1,14 +1,10 @@
package com.zt.life.modules.project.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * software_test_order_measured
@@ -22,13 +18,14 @@
public class SoftwareTestOrderMeasured extends BusiEntity {
   private static final long serialVersionUID = 1L;


   @ApiModelProperty(value = "序号")
   private Integer num;

   @ApiModelProperty(value = "委托单ID")
   private Long orderId;

   @ApiModelProperty(value = "序号")
   private Integer no;

   @ApiModelProperty(value = "被测件名称")
   private String name;

   @ApiModelProperty(value = "标识/版本")
   private String identify;
@@ -36,8 +33,6 @@
   @ApiModelProperty(value = "是否被测件")
   private String isMeasured;

   @TableField(exist = false)
   @ApiModelProperty(value = "字典标签/名称")
   private String dictLabel;

   public SoftwareTestOrderMeasured() {
   }
}