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

zss

3 天以前 dd470a03e64db4757148df1265533476352837c8

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