From ce06cb3e8167151290d68b76b3684ec49e8f31a4 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:04:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
index 27e69af..b1a2fe2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
@@ -3,12 +3,9 @@
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 +19,14 @@
public class SoftwareTestOrderMeasured extends BusiEntity {
private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "搴忓彿")
- private Integer num;
-
@ApiModelProperty(value = "濮旀墭鍗旾D")
private Long orderId;
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "琚祴浠跺悕绉�")
+ private String name;
@ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
private String identify;
@@ -37,7 +35,8 @@
private String isMeasured;
@TableField(exist = false)
- @ApiModelProperty(value = "瀛楀吀鏍囩/鍚嶇О")
- private String dictLabel;
-
+ @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
+ String isMeasuredStr;
+ public SoftwareTestOrderMeasured() {
+ }
}
--
Gitblit v1.9.1