From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 48db369..61e8a8f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfRelation;
 
@@ -24,8 +25,11 @@
 
     Boolean findByuid(Long uid, Long tfid);
 
+    List<ZInfoUser>  findByUaidToFaid(String usid);
     List<ZInfoUser> selectByClanId(Integer clanId);
 
+    AjaxResult findUserNameAClan(List<String> nickNames);
+
     List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
 
     public ZInfoUser getInfoBysysId(Long sysid);

--
Gitblit v1.9.1