From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/resources/mapper/system/SysUserDeptMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 498442d..34d669f 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -9,7 +9,8 @@
         T1.staff_no as staffNo,
         T1.staff_name as staffName,
         T2.dept_id as deptId,
-        T2.dept_name as deptName
+        T2.dept_name as deptName,
+        T1.staff_state as staffState
         FROM
         staff_on_job T1
         LEFT JOIN sys_dept T2 ON T1.sys_dept_id = T2.dept_id

--
Gitblit v1.9.3