From 24cb4c00895e93e3f54c6cc268ea2c44e17d1026 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 11 九月 2023 11:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

---
 src/main/java/com/whyc/controller/ProductLockLogController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/controller/ProductLockLogController.java b/src/main/java/com/whyc/controller/ProductLockLogController.java
index 8211f0d..c813ebc 100644
--- a/src/main/java/com/whyc/controller/ProductLockLogController.java
+++ b/src/main/java/com/whyc/controller/ProductLockLogController.java
@@ -22,7 +22,7 @@
     private ProductLockLogService service;
 
     @ApiOperation("鏌ヨ鍒楄〃-鏍规嵁姣嶆枡缂栫爜鍜屽畾鍒惰〃鍗曞彿")
-    @GetMapping
+    @GetMapping("listByParentCodeAndCustomCode")
     public Response getListByParentCodeAndCustomCode(@RequestParam String parentCode,@RequestParam String customCode){
         List<ProductLockLog> lockLogList = service.getListByParentCodeAndCustomCode(parentCode,customCode);
         return new Response().set(1,lockLogList);

--
Gitblit v1.9.1