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

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

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

@@ -122,4 +122,7 @@
    private Long tenantId;



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