From 7c011f84de74287c75610cce7add18e73db252fd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 十一月 2024 09:49:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WorkController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index bcff12f..6e0d95d 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -115,6 +115,12 @@
         return R.ok().add(basDevpService.getAvailableOutSite(107));
     }
 
+    @RequestMapping("/available/take/merge/site")
+    @ManagerAuth()
+    public R availableTakeMergeSite(){
+        return R.ok().add(basDevpService.getAvailableOutSite(104));
+    }
+
     @RequestMapping("/available/take/check/site/crn")
     @ManagerAuth()
     public R availableTakeCheckSiteCrn(){

--
Gitblit v1.9.1