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

zss

6 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java

@@ -129,4 +129,7 @@

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}