Merge branch 'rcs_master_1.0' into rcs_master_all

zhang

2 天以前 14f2c4fce50c871d84f89d2dca2298e0892b4672

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java

@@ -40,7 +40,7 @@
        return R.ok().add(staTypeService.list());
    }

    @PreAuthorize("hasAuthority('system:staType:list')")
    @PreAuthorize("hasAuthority('manager:staType:list')")
    @PostMapping({"/staType/many/{ids}", "/staTypes/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(staTypeService.listByIds(Arrays.asList(ids)));