Merge remote-tracking branch 'origin/master'

luoyb

2021-04-23 b7e12f6bfcf7d42169dffa5f169843e714833b6a

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java

@@ -210,7 +210,7 @@
            returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            continue;
         }
         empOccupational.setDelFlag(2);
         empOccupational.setDelFlag(0);
         empOccupational.setEmpId(empBaseInfo.getEmpId());
         empOccupational.setDeptName(list.get(1).toString());
         empOccupational.setDeptId(dept.getDeptId());