From 54beb665319b66742cdec3dffb7e298701d61582 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-api/src/main/java/com/moral/api/service/UserService.java |    4 +++-
 1 files changed, 3 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 9a27915..80a183c 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,7 +9,7 @@
 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>
@@ -53,4 +53,6 @@
 
     boolean updateUserId(Integer userId);
 
+    void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond);
+
 }

--
Gitblit v1.8.0