From 24019a8c1d8e78656e85b29ee7be223e0dd253a0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 05 六月 2026 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_new

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

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
index 1b1c69f..307361d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "涓嬪崟绫诲埆")
     private Integer typeSource;
 
+    @ApiModelProperty(value = "鐗╂枡灞炴��")
+    private String materialProp;
+
     @ApiModelProperty(value = "妫�楠岀被鍒�")
     private String orderType;
 

--
Gitblit v1.9.3