Merge remote-tracking branch 'origin/master'

yz

2021-03-07 b8d038947e66850f1a6ec1f93e1805ba33f6fdc0

 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);