From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/asrs/controller/LocAreaController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocAreaController.java b/src/main/java/com/zy/asrs/controller/LocAreaController.java
index e2ee4ef..c2bd1fa 100644
--- a/src/main/java/com/zy/asrs/controller/LocAreaController.java
+++ b/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);
}
}
--
Gitblit v1.9.1