From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 ee95240..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
@@ -1,19 +1,17 @@
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
*
* @author zt generator
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
*/
@Data
@EqualsAndHashCode(callSuper=false)
@@ -21,10 +19,13 @@
public class SoftwareTestOrderMeasured extends BusiEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "搴忓彿")
- private Integer code;
+ @ApiModelProperty(value = "濮旀墭鍗旾D")
+ private Long orderId;
- @ApiModelProperty(value = "鍚嶇О")
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "琚祴浠跺悕绉�")
private String name;
@ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
@@ -33,4 +34,9 @@
@ApiModelProperty(value = "鏄惁琚祴浠�")
private String isMeasured;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
+ String isMeasuredStr;
+ public SoftwareTestOrderMeasured() {
+ }
}
--
Gitblit v1.9.1