From fb89f40499211dae5d74caf3cea2ea696745e7a2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 6 +++++-
1 files changed, 5 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..109c3ac 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,11 @@
//������������������������������������
UserBO selectUserInfo(Map<String, Object> parameters);
- //���������������
+ //���������������������������
Map<String, Object> loginSmallRoutine(Map<String, Object> parameters);
+ //���������������������
+ Map<String, Object> wxLogin(String code);
+
}
--
Gitblit v1.8.0