Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

10 天以前 d14764d097691d35e7015c2d161c612aa7642a8e

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