From 4d62184a9b98a65c78c3aac586fcda2855cf87f4 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 十一月 2026 13:35:06 +0800
Subject: [PATCH] Merge branch 'master' into dev_新高电力
---
src/api/hrm.ts | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/api/hrm.ts b/src/api/hrm.ts
index 17ebd2e..829eaa4 100644
--- a/src/api/hrm.ts
+++ b/src/api/hrm.ts
@@ -59,6 +59,7 @@
id?: number; userId?: number; userName?: string; deptId?: number; deptName?: string; phone?: string; date?: string;
clockInTime?: string; clockOutTime?: string; clockInType?: number; clockInTypeName?: string; clockOutType?: number;
clockOutTypeName?: string; workHours?: number; overtimeHours?: number; location?: string; dataSource?: number;
+ leaveFlag?: boolean; leaveHours?: number; leaveTypes?: string;
dataSourceName?: string; remark?: string; createTime?: string;
}
export interface AttendanceClockable {
@@ -67,6 +68,7 @@
export interface AttendanceMyStatus {
userId?: number; employeeId?: number; employeeName?: string; deptId?: number; deptName?: string;
date?: string; serverTime?: string; workDay?: boolean; restDayReason?: string | null;
+ onLeave?: boolean; leaveHours?: number; leaveTypeNames?: string;
rule?: AttendanceRule | null; record?: AttendanceRecord | null; clockable?: AttendanceClockable;
}
export interface AttendanceClockRequest {
--
Gitblit v1.9.3