From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +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 80a183c..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,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,7 @@
boolean updateUserId(Integer userId);
- void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond);
+ // ���������������
+ void pushOneUser(Allocation appAllocationPushUserCond);
}
--
Gitblit v1.8.0