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

yuan

2026-05-18 db13a3d02bdf713087835f0c3a5522758a5948ea

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