From 55d7987024ec302f27b58d75c6788ff8e04df636 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 11:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index df0c1ae..d253543 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -10,6 +10,7 @@
public class SampleProductDto2 extends OrderBy implements Serializable {
private Integer id;
+ private Integer insProductId;
@ValueTableShow(name = "鏍峰搧缂栧彿")
private String sampleCode;
@@ -41,7 +42,7 @@
private String inspectionValueType;
@ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
- private String ask;
+ private String tell;
@ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
private String lastValue;
@@ -49,6 +50,12 @@
@ValueTableShow(value = 14, name = "缁撴灉鍒ゅ畾")
private Integer insResult;
+ @ValueTableShow(value = 15, name = "妫�楠屼汉")
+ private String checkName;
+
+ @ValueTableShow(value = 16, name = "妫�楠屾棩鏈�")
+ private String checkTime;
+
private String equipValue;
}
--
Gitblit v1.9.3