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/InsProductResult.java |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
index b04040a..2ccace9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
@@ -11,7 +11,7 @@
 import lombok.Data;
 
 /**
- * 
+ * 妫�楠岄」鐩殑缁撴灉
  * @TableName ins_product_result
  */
 @TableName(value ="ins_product_result")
@@ -20,7 +20,7 @@
     /**
      * 
      */
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -34,34 +34,28 @@
     private String insValue;
 
     /**
-     * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+     * 璁$畻鍊�
      */
-    private Integer insResult;
+    private String comValue;
 
     /**
-     * 鏈�缁堝��
+     * 璁惧鍊�
      */
-    private String lastValue;
+    private String equipValue;
 
-    @ApiModelProperty("")
+    private String equipName;
+
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
-    /**
-     *
-     */
+
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
-    /**
-     *
-     */
-    @ApiModelProperty("")
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
-    /**
-     *
-     */
+
     @ApiModelProperty("淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

--
Gitblit v1.9.3