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/TExperimentDispatchVO.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentDispatchVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentDispatchVO.java index 4888400..8b57a9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentDispatchVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TExperimentDispatchVO.java @@ -1,6 +1,5 @@ package com.ruoyi.system.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.system.model.TExperimentDispatch; import com.ruoyi.system.model.TExperimentDispatchGroup; import com.ruoyi.system.model.TExperimentDispatchParticipants; @@ -28,5 +27,7 @@ private List<TExperimentDispatchParticipants> experimentDispatchParticipants; @ApiModelProperty(value = "组别列表") private List<TExperimentDispatchTask> experimentDispatchTasks; + @ApiModelProperty(value = "当前实验员,和化验师是否已确认状态") + private Integer otherStatus; } -- Gitblit v1.7.1