Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-30 a3c54410de03f0fd242e1a1118d6471300cf1eda

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