Merge remote-tracking branch 'origin/master'

yz

2021-02-27 be8f6f934191cfa787564d59fdd69810fad05cc5

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

@@ -50,7 +50,6 @@

    @ApiOperation(value = "员工离职记录翻页列表")
    @GetMapping("list")
    @PreAuthorize("hasAuthority('empDimissionlog:list')")
    public FebsResponse empDimissionlogList(QueryRequest request, EmpDimissionLog empDimissionlog) {
        Map
                <String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));