Merge branch 'dev_New_pro' into dev_山西_晋和园_pro

gongchunyi

2026-05-16 c5aac1b321d3840a56ccc41108d42b389d68681e

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