Merge remote-tracking branch 'origin/master'

yz

2021-03-05 749ad6fe2e845433622992aa0aacd8b0d7714ccc

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

@@ -927,4 +927,14 @@
        }

    }

    @Override
    public EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb) {
        try {
            return this.getOne(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getEmpNumb,empNumb).ne(EmpBaseInfo::getDelFlag,1));
        }catch (Exception e){
            return  null;
        }

    }
}