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/controller/AppUserController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index 19b66b0..c6157c1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -21,6 +21,7 @@
import javax.validation.Valid;
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.Allocation;
import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
import com.moral.api.service.UserService;
@@ -72,7 +73,7 @@
@PostMapping("pushOneUser")
@ApiOperation(value = "���������������������")
- public ResultMessage pushOneUser(@Valid @RequestBody AppAllocationPushUserCond appAllocationPushUserCond){
+ public ResultMessage pushOneUser(@Valid @RequestBody Allocation appAllocationPushUserCond){
userService.pushOneUser(appAllocationPushUserCond);
// String body = push("oOCWi6-_hnzSvrMT8HX5D7Dz7tEA");
return ResultMessage.ok();
--
Gitblit v1.8.0