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

liyong

4 天以前 33f9eae4ad4321860e4881f5f38dad6368c878ef

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

@@ -76,4 +76,7 @@

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

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