Merge remote-tracking branch 'origin/master'

luoyb

2021-04-23 b7e12f6bfcf7d42169dffa5f169843e714833b6a

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

@@ -126,6 +126,7 @@

    @ApiOperation(value = "人员基本信息逻辑删除")
    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empBaseinfo:delete')")
    public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}")  @PathVariable("ids") String ids) throws FebsException {
        try {
            this.empBaseInfoService.logicDelEmpBaseInfo(ids);