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

@@ -101,7 +101,6 @@

    @ApiOperation(value = "员工离职记录逻辑删除")
    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empDimissionlog:delete')")
    public void logicDeleteEmpDimissionlog(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empDimissionlogService.logicDelEmpDimissionLog(ids);