From db2b41de1911ec09bb3567c4d85b029ce9a356ca Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 08 五月 2024 07:27:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 16 +++++++++++----- 1 files changed, 11 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 9f5aa68..d669ecf 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; /** * 妫�楠岄」鐩� @@ -66,6 +64,8 @@ * 鍨嬪彿 */ private String model; + + private String methodS; /** * 瀛愬疄楠屽 @@ -188,4 +188,10 @@ @TableField(exist = false) private Map<String, Object> style; + + @TableField(exist = false) + private InsProductResult insProductResult; + + @TableField(exist = false) + private String templateName; } \ No newline at end of file -- Gitblit v1.9.3