From d2f503f72b5485bfee54ea296c7d0a9a243cea02 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 14 一月 2026 17:51:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 9755c40..65b020d 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
@@ -4,7 +4,7 @@
 import lombok.Data;
 
 @Data
-public class InsOrderPlanVO{
+public class InsOrderPlanVO {
 
 
     private Integer id;
@@ -15,6 +15,9 @@
     @ApiModelProperty("鏍峰搧鍚嶇О")
     private String sample;
 
+    @ApiModelProperty("鐗╂枡灞炴��")
+    private String materialProp;
+
     @ApiModelProperty("闆朵欢鎻忚堪")
     private String partDesc;
 

--
Gitblit v1.9.3