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

云

2026-05-18 39e6d6469b652daaf4af66b8b75f8dad2f95923c

 src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java

@@ -67,4 +67,7 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

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