Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

yuan

9 天以前 128477234dfccf2b06b608b5569595607d9752cf

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