Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁

yuan

2026-05-14 86089ed4cb7c294cda676947f5fc672c9561e4b3

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