From 943c5905b7f4ff48c7ae87c41b41aeae854f8a20 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:02:09 +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 |    3 ++-
 1 files changed, 2 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 80a183c..37282b5 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,6 +5,7 @@
 
 
 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;
 
@@ -53,6 +54,6 @@
 
     boolean updateUserId(Integer userId);
 
-    void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond);
+    void pushOneUser(Allocation appAllocationPushUserCond);
 
 }

--
Gitblit v1.8.0