From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java
index 342fba4..5276cca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java
@@ -50,7 +50,7 @@
* 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧涓讳汉淇℃伅
*/
@GetMapping()
- public AjaxResult getByPetId(@PathParam("pid")Long pid){
+ public AjaxResult getByPetId(@PathParam("pid")String pid){
return zfMasterService.getMasterInfoByPetId(pid);
}
--
Gitblit v1.9.1