Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-07 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635

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

@@ -51,7 +51,6 @@
    }

    @GetMapping("list")
    @PreAuthorize("hasAuthority('empLabortrouble:list')")
    public FebsResponse empLabortroubleList(QueryRequest request, EmpLaborTrouble empLabortrouble) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLabortroubleService.findEmpLabortroubles(request, empLabortrouble));
        return new FebsResponse().data(dataTable);