Merge remote-tracking branch 'origin/master'

luoyb

2021-04-23 b7e12f6bfcf7d42169dffa5f169843e714833b6a

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

@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper">

   <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpPhysicalExam">
        select a.* from t_emp_physicalexam a 
        select a.*,b.allDeptName from t_emp_physicalexam 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}