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/InsProduct.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index 8df3108..9993d86 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -176,7 +176,7 @@
private String lastValue;
/**
- * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸 3:涓嶅垽瀹�
*/
private Integer insResult;
@@ -221,6 +221,9 @@
private InsProductResult insProductResult;
@TableField(exist = false)
+ private List<InsProductResult2> insProductResult2;
+
+ @TableField(exist = false)
private String templateName;
private String dic;
@@ -228,12 +231,6 @@
private String temperature;
//婀垮害
private String humidity;
-
- private Integer insFiberId;
-
- private Integer insFibersId;
-
- private Integer insBushId;
private Integer standardMethodListId;
--
Gitblit v1.9.3