Merge branch 'dev_New_pro' into dev_New_pro_财务

zss

2026-05-21 b5d5cb947a194ceb34cd2797ab077f1484989305

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