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

liyong

7 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

 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