From 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 07 六月 2021 11:10:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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