From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index fe6ff0c..dfc14fb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -7,13 +7,16 @@
public class InsOrderPlanVO{
- private String id;
+ private Integer id;
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sample;
+
+ @ApiModelProperty("鐗╂枡灞炴��")
+ private String materialProp;
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
@@ -73,6 +76,8 @@
private String tempUrlPdf;
@ApiModelProperty("鎶ュ憡id")
- private String insReportId;
+ private Integer insReportId;
+ @ApiModelProperty(value = "鏄惁涓烘媶鍒嗚鍗�(0:鍚� 1:鏄�)")
+ private Integer isSplitOrder;
}
--
Gitblit v1.9.3