Merge remote-tracking branch 'origin/master'

王佳豪

2021-04-26 6704225b102b684e6ce4e88fa897414fac06c9f1

 src/main/java/com/zy/asrs/controller/LocAreaController.java

@@ -135,8 +135,8 @@

    @RequestMapping(value = "/locArea/queryAll/auth")
    @ManagerAuth
    public R queryAll() {
        List<LocArea> result = locAreaService.queryAllLocArea();
    public R queryAll(String areaType) {
        List<LocArea> result = locAreaService.queryAllLocArea(areaType);
        return R.ok(result);
    }
}