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/query/TSamplingRecordQuery.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
index 5200d82..3f8bf6d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "取样记录查询query")
public class TSamplingRecordQuery extends TimeRangeQueryBody {
@@ -19,8 +21,19 @@
@ApiModelProperty(value = "实验编号")
private String experimentCode;
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
@ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "用户id 前端忽略")
+ private Long userId;
+
+ @ApiModelProperty(value = "实验id 前端忽略")
+ private List<String> dispatchIds;
+
+ private Integer roleType;
+
}
--
Gitblit v1.7.1