Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2 天以前 d29080af4e965ba341cb85a5bc45ecd183c06783

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