From c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:53:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java |   90 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 19 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 e290565..12d10fe 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
@@ -1,15 +1,16 @@
 package com.yuanchu.mom.pojo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.*;
+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.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 妫�楠岄」鐩�
@@ -29,15 +30,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;
 
     /**
      * 宸ュ巶
@@ -64,6 +73,13 @@
      */
     private String model;
 
+    private String methodS;
+
+    /**
+     * 瀛愬疄楠屽
+     */
+    private String sonLaboratory;
+
     /**
      * 璁￠噺鍗曚綅
      */
@@ -77,7 +93,7 @@
     /**
      * 宸ユ椂(H)
      */
-    private Integer manHour;
+    private Double manHour;
 
     /**
      * 宸ユ椂鍒嗙粍
@@ -134,32 +150,68 @@
      */
     private String ask;
 
+    /**瑕佹眰鎻忚堪*/
+    private String tell;
+
+    /**
+     * 鏈�缁堝��
+     */
+    @TableField("`last_value`")
+    private String lastValue;
+
+    /**
+     * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+     */
+    private Integer insResult;
+
     /**
      * 1锛氭湁鏁� 0锛氭棤鏁�
      */
     private Integer state;
 
-    @ApiModelProperty("")
+    /**
+     * 澶栭敭锛歩ns_sample琛╥d
+     */
+    private Integer insSampleId;
+
     @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")
     private LocalDateTime updateTime;
+
+    /**
+     * 澶栭敭锛歴tandard_template琛╥d
+     */
+    private Integer templateId;
+
+    @TableField(exist = false)
+    private List<JSONObject> template;
+
+    @TableField(exist = false)
+    private Map<String, Object> style;
+
+    @TableField(exist = false)
+    private InsProductResult insProductResult;
+
+    @TableField(exist = false)
+    private String templateName;
+
+    private String dic;
+
+    private Integer insFiberId;
+
+    private Integer insFibersId;
+
+    private Integer standardMethodListId;
 }
\ No newline at end of file

--
Gitblit v1.9.3