From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java |   20 ++++++++++++++++++++
 1 files changed, 20 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..cc0ea56 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,10 +12,30 @@
 @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 = "实验调度信息")
     private TExperimentDispatch experimentDispatch;
 
+    @ApiModelProperty(value = "已发送数量")
+    private Long sendCount;
+
+    @ApiModelProperty(value = "待接收数量")
+    private Long receiveCount;
+
+    @ApiModelProperty(value = "已接收数量")
+    private Long receivedCount;
+
+    @ApiModelProperty(value = "实验员名称")
+    private String testerNames;
 }

--
Gitblit v1.7.1