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

yuan

2026-06-20 812f2de34b5713c4da08932d95e634de81e9b248

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

@@ -95,4 +95,7 @@

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

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