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

yyb

7 天以前 c8db0d9987935b82c4a8ca97ce6aaafd19c1f707

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