From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能:支持数据填充,发现单元格合并bug,发现模板重复

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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..92e92df 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,11 +1,14 @@
 package com.yuanchu.mom.pojo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.*;
 
 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;
@@ -179,4 +182,13 @@
      * 澶栭敭锛歴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;
 }
\ No newline at end of file

--
Gitblit v1.9.3