Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

6 天以前 60a665f3c576f8fe368ddfaabc9117a9c5dd47bf

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java

@@ -160,7 +160,7 @@
    @PreAuthorize("hasAuthority('manager:locItem:list')")
    @GetMapping("/locItem/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(locService.getById(id));
        return R.ok().add(locItemService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:locItem:save')")