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

zss

8 天以前 3e5315bf1913ec325697f22104fcd2758c98891a

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