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

云

19 小时以前 9683f8f2b526f67bff039a1cd46818808b53ab3e

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