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

liyong

2026-04-30 a6ff41048bbdd5b8519a3e21e9232a152d179dfc

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

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



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