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

zss

3 天以前 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3

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