From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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 109c3ac..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,11 +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.AppUserCond;
+import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
/**
* <p>
@@ -51,5 +52,9 @@
//���������������������
Map<String, Object> wxLogin(String code);
+ boolean updateUserId(Integer userId);
+
+ // ���������������
+ void pushOneUser(Allocation appAllocationPushUserCond);
}
--
Gitblit v1.8.0