From c8cc61e84189d8f986f7c4657d543408021b3da0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:56 +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 | 11 ++++++++++-
1 files changed, 10 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..56ef3f0 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
@@ -5,10 +5,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.Allocation;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
/**
* <p>
@@ -44,8 +46,15 @@
//������������������������������������
UserBO selectUserInfo(Map<String, Object> parameters);
- //���������������
+ //���������������������������
Map<String, Object> loginSmallRoutine(Map<String, Object> parameters);
+ //���������������������
+ Map<String, Object> wxLogin(String code);
+
+ boolean updateUserId(Integer userId);
+
+ // ���������������
+ void pushOneUser(Allocation appAllocationPushUserCond);
}
--
Gitblit v1.8.0