From dfacb4e315a49f2c0399574ef094c87b96e7e248 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 24 七月 2025 09:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ywx_ztns' into dev_ywx_ztns

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

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 6e3acde..bdf55f3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -89,6 +89,11 @@
     private String sampleStr;
 
 
+    @ApiModelProperty("鎬讳环")
+    private String totalPrice;
+
+    @ApiModelProperty("璁㈠崟id(瀵煎嚭鐢�)")
+    private String ids;
 
 
 }

--
Gitblit v1.9.3