From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 20 五月 2025 18:52:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java index 80ee276..950f53c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFeasibilityStudyReportQuery.java @@ -5,8 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data -@ApiModel(value="可研、可行、工艺开发工具、验证发布报告管理查询参数query") +@ApiModel(value="(可研、可行、工艺开发工具、验证发布报告管理)、(课题评定列表)查询参数query") public class TFeasibilityStudyReportQuery extends TimeRangeQueryBody { @ApiModelProperty(value = "项目组名称") @@ -21,7 +23,13 @@ @ApiModelProperty(value = "类型 1=可研报告 2=可行报告 3=工艺开发工具 4=验证与发布") private Integer reportType; + @ApiModelProperty(value = "提交人") + private String createBy; + @ApiModelProperty(value = "状态 -1=草稿箱 1=待审核 2=待评定 3=已评定 4=已驳回 5=已撤回") private Integer status; + @ApiModelProperty(value = "项目组id集合 前端忽略") + private List<String> teamIds; + } -- Gitblit v1.7.1