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/query/TProjectProposalQuery.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java index 05dd4ef..7710ab4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel(value = "项目课题方案query") public class TProjectProposalQuery extends TimeRangeQueryBody { @@ -19,4 +21,9 @@ private String createBy; @ApiModelProperty(value = "审批状态 -1=草稿箱 1=审批中 2=已通过 3=已驳回 4=已撤销 5=已封存") private Integer auditStatus; + + @ApiModelProperty(value = "项目组id集合 前端忽略") + private List<String> teamIds; + + private Integer roleType; } -- Gitblit v1.7.1