Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

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

@@ -93,7 +93,6 @@
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empLabortrouble:delete')")
    public void logicDeleteEmpLabortrouble(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empLabortroubleService.logicDelEmpLabortrouble(ids);