From ba97f97d28f65d2b8ed5406792aa66a9d3fc9ed8 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 29 十二月 2025 15:05:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 2eaffaa..2a2514e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,7 +22,9 @@
public interface ZInfoUserService extends IService<ZInfoUser> {
- void setUaidSame(String phone, String username,String uniqueId);
+ Boolean setUaidSame(String phone, String username,String uniqueId);
+
+ void setUserInfoSame(ZInfoUser zInfoUser);
void setSpouseOnly(Long spouse);
@@ -44,6 +46,8 @@
// AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
+
+ ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser);
AjaxResult removeByUserName(List<String> userName);
List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
--
Gitblit v1.9.1