Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-13 cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java

@@ -97,6 +97,9 @@
       if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
           throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
       }
       if(this.empBaseInfoService.verifyCertificateNumb(empBaseinfo)){
           throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
       }
        try {
            this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
        } catch (Exception e) {