From a8f678206bc9032bad6920510094df817fcb6186 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 23 五月 2025 17:45:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java index 69adafc..726accf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java @@ -1,6 +1,9 @@ package com.ruoyi.system.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseModel; import io.swagger.annotations.ApiModel; @@ -8,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -65,4 +67,15 @@ @TableField("status") private Integer status; + @ApiModelProperty(value = "课题方案名称") + @TableField(exist = false) + private String projectName; + @ApiModelProperty(value = "课题方案编号") + @TableField(exist = false) + private String projectCode; + + @ApiModelProperty(value = "参与人员名称拼接") + @TableField(exist = false) + private String participantsName; + } -- Gitblit v1.7.1