From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 2014bd2..a4e7677 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;
/**
* 妫�楠岄」鐩�
@@ -63,6 +64,8 @@
* 鍨嬪彿
*/
private String model;
+
+ private String methodS;
/**
* 瀛愬疄楠屽
@@ -139,9 +142,13 @@
*/
private String ask;
+ /**瑕佹眰鎻忚堪*/
+ private String tell;
+
/**
* 鏈�缁堝��
*/
+ @TableField("`last_value`")
private String lastValue;
/**
@@ -179,4 +186,18 @@
* 澶栭敭锛歴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;
}
\ No newline at end of file
--
Gitblit v1.9.3