Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-06-09 da40f82d921daa63de501392519c6ecfbe8962a3

 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);
    }
}