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

gongchunyi

2026-05-22 b3712bb9c618d3cb74b6a200fd83c2ba0577ac3d

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