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/TExperimentDispatchVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 34cff03..4888400 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,5 +1,6 @@
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;
@@ -16,8 +17,10 @@
@ApiModelProperty(value = "项目课题方案名称")
private String projectName;
- @ApiModelProperty(value = "参与人员名称拼接")
- private String participantsName;
+ @ApiModelProperty(value = "项目阶段 1=实验室开发阶段 2=中式试验阶段 3=生产验证试验阶段")
+ private Integer projectStage;
+ @ApiModelProperty(value = "方案编号")
+ private String projectCode;
@ApiModelProperty(value = "组别列表")
private List<TExperimentDispatchGroup> experimentDispatchGroups;
--
Gitblit v1.7.1