From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/hrm/employee/index.ts | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/api/hrm/employee/index.ts b/src/api/hrm/employee/index.ts
index 0287f85..4c0360a 100644
--- a/src/api/hrm/employee/index.ts
+++ b/src/api/hrm/employee/index.ts
@@ -9,8 +9,8 @@
userId?: number;
deptId?: number;
deptName?: string;
- postId?: number;
- postName?: string;
+ postIds?: number[];
+ postNames?: string;
employeeNo?: string;
name?: string;
gender?: number;
@@ -29,6 +29,7 @@
employeeStatus?: number;
annualLeaveBalance?: number;
sickLeaveBalance?: number;
+ salaryStructureId?: number;
baseSalary?: number;
roleIds?: number[];
roleNames?: string[];
@@ -167,4 +168,4 @@
/** 鍒犻櫎绱ф�ヨ仈绯讳汉 */
export function deleteEmergencyContact(id: number) {
return requestClient.delete(`/hrm/employee/emergency-contact/delete?id=${id}`);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3