From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index b49c75c..496675c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -86,7 +86,7 @@
*/
private String remark;
- private Integer standardMethodListId;
+ private String standardMethodListId;
@ApiModelProperty("鏍峰搧鍗曚綅")
private String unit;
@@ -112,6 +112,17 @@
private Integer parentId;
@TableField(select = false,exist = false)
- private Integer num;
+ private Integer num=1;
+
+ @ApiModelProperty("璇曢獙瑕佹眰:绉诲姩,鑱旈��,鐢典俊")
+ private String testRequirements;
+
+ /**
+ * 鐢垫満缂栧彿
+ */
+ private String motorNumber;
+
+ @TableField(exist = false,select = false)
+ private String entrustCode;
}
\ No newline at end of file
--
Gitblit v1.9.3