Merge remote-tracking branch 'origin/master'

yz

2021-03-09 dfed60326c07756d3710d74c3aa44b537602adda

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

@@ -36,7 +36,6 @@
    private final IEmpAccessoryService empAccessoryService;

    @GetMapping
    @PreAuthorize("hasAuthority('empAccessory:list')")
    public FebsResponse getAllEmpAccessorys(EmpAccessory empAccessory) {
        return new FebsResponse().data(empAccessoryService.findEmpAccessorys(empAccessory));
    }
@@ -128,4 +127,16 @@
            throw new FebsException(message);
        }
    }


    @PostMapping("autoInstall")
    public void autoInstall(  String fileids) throws FebsException {
        try {
            this.empAccessoryService.autoInstall(fileids);
        } catch (Exception e) {
            String message = "插入文件失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}