Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpUnemploymentMapper">
   <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpUnemployment">
        select a.* from t_emp_unemployment a 
        select a.*,b.allDeptName from t_emp_unemployment a
        inner join t_emp_baseinfo b on a.empId = b.empId
        inner join t_dept c on b.deptId = c.DEPT_ID
        ${ew.customSqlSegment}