Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 ce0651907f18a57dae80065e01589e975530f53e

 ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java

@@ -30,6 +30,10 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "提交人id")
    @TableField("commit_user_id")
    private Long commitUserId;

    @ApiModelProperty(value = "项目课题方案")
    @TableField("project_name")
    private String projectName;