From 9a98121231685145fdc0f78ac2d48d02e0eb68d6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 03 七月 2024 22:22:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 e4c8304..14dd76e 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
@@ -14,9 +14,10 @@
/**
* 妫�楠岄」鐩�
+ *
* @TableName ins_product
*/
-@TableName(value ="ins_product")
+@TableName(value = "ins_product")
@Data
public class InsProduct implements Serializable {
/**
@@ -30,15 +31,23 @@
*/
private String inspectionItem;
+ private String inspectionItemEn;
+
/**
* 妫�楠岄」鍒嗙被
*/
- private String inspectionItemClassify;
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+ private String inspectionItemClass;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+ private String inspectionItemClassEn;
/**
* 妫�楠岄」瀛愮被
*/
private String inspectionItemSubclass;
+
+ private String inspectionItemSubclassEn;
/**
* 宸ュ巶
@@ -142,7 +151,9 @@
*/
private String ask;
- /**瑕佹眰鎻忚堪*/
+ /**
+ * 瑕佹眰鎻忚堪
+ */
private String tell;
/**
@@ -200,8 +211,14 @@
private String templateName;
private String dic;
+ //娓╁害
+ private String temperature;
+ //婀垮害
+ private String humidity;
private Integer insFiberId;
private Integer insFibersId;
+
+ private Integer standardMethodListId;
}
\ No newline at end of file
--
Gitblit v1.9.3