Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

2026-05-27 620bb4712a31791231c4381581f0f60088f079fe

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