From 40eb98bcf3028ca1de391ac140f44920eddd9e8b Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 10:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 5035ac7..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,5 +1,6 @@
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.ApiModelProperty;
@@ -15,7 +16,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 = "濮旀墭鍗旾D")
@@ -33,6 +34,9 @@
@ApiModelProperty(value = "鏄惁琚祴浠�")
private String isMeasured;
-
-
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
+ String isMeasuredStr;
+ public SoftwareTestOrderMeasured() {
+ }
}
--
Gitblit v1.9.1