From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 5e766e5..081ad8d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -51,9 +51,9 @@
public AjaxResult getByFId(@PathVariable("fid") Long fid){
return AjaxResult.success(zfFamilyService.getByFid(fid));
}
- @GetMapping("/findByFname/{name}")
- public AjaxResult getByFName(@PathVariable("name") String name){
- return AjaxResult.success(zfFamilyService.getByName(name));
+ @GetMapping("/findByFname/{name}/{clanId}")
+ public AjaxResult getByFName(@PathVariable("name") String name, @PathVariable("clanId") Integer clanId){
+ return AjaxResult.success(zfFamilyService.getByName(name, clanId));
}
--
Gitblit v1.9.1