From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 11 十月 2023 10:24:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6 --- src/main/java/com/zy/asrs/controller/LocOwnerController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java index 4cbadd7..2d5c6d3 100644 --- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java +++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java @@ -122,4 +122,18 @@ return R.ok(); } + @RequestMapping("/owner/auto/site") + @ManagerAuth() + public R availableTakeSite(){ + List<Map<String, Object>> result = new ArrayList<>(); + List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<>()); + for (LocOwner owner : locOwners) { + Map<String, Object> map = new HashMap<>(); + map.put("siteId", owner.getId()); + map.put("desc", owner.getOwner()); + result.add(map); + } + return R.ok().add(result); + } + } -- Gitblit v1.9.1