Merge branch 'refs/heads/dev_New' into dev_西宁_湟水峡

liyong

2026-04-20 d697e4fa4468a803d97905164da5cbdded859858

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

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

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