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 |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 4b628b7..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
@@ -14,9 +14,10 @@
 
 /**
  * 妫�楠岄」鐩�
+ *
  * @TableName ins_product
  */
-@TableName(value ="ins_product")
+@TableName(value = "ins_product")
 @Data
 public class InsProduct implements Serializable {
     /**
@@ -150,7 +151,9 @@
      */
     private String ask;
 
-    /**瑕佹眰鎻忚堪*/
+    /**
+     * 瑕佹眰鎻忚堪
+     */
     private String tell;
 
     /**
@@ -208,8 +211,18 @@
     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