From 1ae5f2198b70aba54c49f1752e02dfe7b9d5a2e9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 04 八月 2024 17:35:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 0820141..c628b9d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -70,10 +70,11 @@
     }
 
     @ApiOperation("琛ョ墖鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrintCustomLabel/{type}")
+    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
     public Result getSelectPrintCustomLabel( @PathVariable String type,
+                                             @PathVariable Integer lableType,
                                              @RequestBody Map<String, Object> object) {
-        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,object));
+        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
 
     }
 }

--
Gitblit v1.8.0