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 | 6 ++++++
1 files changed, 6 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 1f61c32..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
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -85,9 +86,14 @@
@ApiModelProperty("瀛愬疄楠屽")
private String sonLaboratory;
+ private String sampleStr;
+ @ApiModelProperty("鎬讳环")
+ private String totalPrice;
+ @ApiModelProperty("璁㈠崟id(瀵煎嚭鐢�)")
+ private String ids;
}
--
Gitblit v1.9.3