From a1e19c7466cce45b5bb360e38ab7c7c1753986f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 15:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java
index ab4d170..7b220da 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/OrderSplitDTO.java
@@ -31,4 +31,7 @@
     @ApiModelProperty("鏄惁鍚屾鍒癕ES")
     private Boolean pushToMes;
 
+    @ApiModelProperty("鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夋潗鏂�")
+    private String materialProp;
+
 }

--
Gitblit v1.9.3