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/EmpResignController.java

@@ -94,7 +94,6 @@
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empResign:delete')")
    public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empResignService.logicDelEmpResign(ids);