From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/service/UserService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 6336d44..9a27915 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -9,6 +9,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.pojo.query.AppUserCond;
 
 /**
  * <p>
@@ -44,8 +45,12 @@
     //������������������������������������
     UserBO selectUserInfo(Map<String, Object> parameters);
 
-    //���������������
+    //���������������������������
     Map<String, Object> loginSmallRoutine(Map<String, Object> parameters);
 
+    //���������������������
+    Map<String, Object> wxLogin(String code);
+
+    boolean updateUserId(Integer userId);
 
 }

--
Gitblit v1.8.0