Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

10 天以前 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

 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;
}