Merge remote-tracking branch 'origin/master'

孔

2021-06-23 bb3139e62038f3c165253cf5724325092966be78

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

@@ -92,7 +92,6 @@
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empOccupational:delete')")
    public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empOccupationalService.logicDelEmpOccupational(ids);