From 33fea8cb7804ba9ee45a1c832907cbde5f336444 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 五月 2025 09:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java | 10 ++++++++++
1 files changed, 10 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 1ccdfe2..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
@@ -1,5 +1,6 @@
package com.ruoyi.system.vo;
+import com.ruoyi.system.model.TExperimentDispatch;
import com.ruoyi.system.model.TSamplingRecord;
import com.ruoyi.system.model.TSamplingRecordOperation;
import io.swagger.annotations.ApiModel;
@@ -11,8 +12,17 @@
@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;
}
--
Gitblit v1.7.1