From a3eaa78c6d839b640c728f4c7d8eb27732627b07 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa

---
 screen-api/src/main/java/com/moral/api/service/UserService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 4b11228..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,4 +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