Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 bd74f59a411383e32eb17a69cc5a7ada1571023e

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

@@ -76,4 +76,7 @@

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

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