From 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 27 六月 2025 18:08:25 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/laboratory --- ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java index b2297db..70cb99e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java @@ -17,8 +17,14 @@ @ApiModelProperty(value = "实验编号") private String experimentCode; + @ApiModelProperty(value = "实验名称") + private String experimentName; + @ApiModelProperty(value = "状态 -1=草稿箱 1=待确认 2=已确认 3=已封存") private Integer status; + + @ApiModelProperty(value = "状态 1=待确认 2=已确认") + private Integer otherStatus; @ApiModelProperty(value = "用户id 前端忽略") private Long userId; @@ -26,4 +32,9 @@ @ApiModelProperty(value = "实验id 前端忽略") private List<String> dispatchIds; + @ApiModelProperty(value = "实验id 实验员和化验师使用 前端忽略") + private List<String> dispatchIdList; + + private Integer roleType; + } -- Gitblit v1.7.1