Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

6 天以前 432508320e929bb5ab37d58e8b8b885174b576c5

 src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java

@@ -129,4 +129,7 @@

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}