Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-20 34181dcf0e38d744b8af1917bb5b8b0180b9eae1

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