From d5f446da1b638fe1024c35f9732e72c12d71f1f8 Mon Sep 17 00:00:00 2001
From: baiXiao8813 <516776535@qq.com>
Date: 星期二, 27 七月 2021 14:14:37 +0800
Subject: [PATCH] 立库日入库、出库导出列顺序调整
---
src/main/java/com/zy/asrs/controller/LocAreaController.java | 10 ++++++++--
1 files changed, 8 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..c039b18 100644
--- a/src/main/java/com/zy/asrs/controller/LocAreaController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAreaController.java
@@ -135,8 +135,14 @@
@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);
+ }
+
+ @RequestMapping(value = "locArea/query/allArea")
+ public R queryAllArea() {
+ List<LocArea> result = locAreaService.selectList(new EntityWrapper<>());
return R.ok(result);
}
}
--
Gitblit v1.9.1