Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

 ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectProposalQuery.java

@@ -21,6 +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;
}