From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 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 687666d..a0f694d 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
@@ -2,23 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
/**
* 妫�楠岄」鐩�
+ *
* @TableName ins_product
*/
-@TableName(value ="ins_product")
+@TableName(value = "ins_product")
@Data
public class InsProduct implements Serializable {
/**
@@ -32,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;
/**
* 宸ュ巶
@@ -145,8 +152,14 @@
private String ask;
/**
+ * 瑕佹眰鎻忚堪
+ */
+ private String tell;
+
+ /**
* 鏈�缁堝��
*/
+ @TableField("`last_value`")
private String lastValue;
/**
@@ -193,4 +206,23 @@
@TableField(exist = false)
private InsProductResult insProductResult;
+
+ @TableField(exist = false)
+ private String templateName;
+
+ private String dic;
+ //娓╁害
+ private String temperature;
+ //婀垮害
+ private String humidity;
+
+ private Integer insFiberId;
+
+ private Integer insFibersId;
+
+ private Integer standardMethodListId;
+
+ //杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
+ @TableField(exist = false ,select = false)
+ private String complue;
}
\ No newline at end of file
--
Gitblit v1.9.3