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 | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 9f5aa68..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
@@ -2,17 +2,15 @@
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 java.util.List;
import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* 妫�楠岄」鐩�
@@ -32,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;
/**
* 宸ュ巶
@@ -66,6 +72,8 @@
* 鍨嬪彿
*/
private String model;
+
+ private String methodS;
/**
* 瀛愬疄楠屽
@@ -142,9 +150,13 @@
*/
private String ask;
+ /**瑕佹眰鎻忚堪*/
+ private String tell;
+
/**
* 鏈�缁堝��
*/
+ @TableField("`last_value`")
private String lastValue;
/**
@@ -188,4 +200,18 @@
@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