Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-27 4e94fa3ebf98bb8a9a6eda39a7324461fc4ebb40

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

@@ -2,4 +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.EmpJobChangeMapper">

    <select id="selectPageVo" resultType="java.util.Map">
        select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
    </select>
</mapper>