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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

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

@@ -86,4 +86,7 @@
    @ApiModelProperty("备注")
    private String remark;


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