From 66e89415b0592169ce7e1d1c22c8fd78cc89a83c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 09:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java
index b861bdc..ee24934 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java
@@ -12,7 +12,14 @@
 @Data
 @ApiModel(value = "取样记录VO")
 public class TSamplingRecordVO extends TSamplingRecord {
+    @ApiModelProperty(value = "项目课题方案")
+    private String projectName;
 
+    @ApiModelProperty(value = "实验编号")
+    private String experimentCode;
+
+    @ApiModelProperty(value = "实验名称")
+    private String experimentName;
     @ApiModelProperty(value = "取样操作记录集合")
     private List<TSamplingRecordOperation> samplingRecordOperations;
     @ApiModelProperty(value = "实验调度信息")

--
Gitblit v1.7.1