From c06b2f5b2aa6d8910664b30ab4f74ff3895ebbeb Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 20 Sep 2024 10:27:45 +0800
Subject: [PATCH] Merge branch 'master' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
index a8c6501..20ad3d8 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -28,7 +28,7 @@
* @return
*/
@PostMapping("/get-userinfo")
- public Object getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
- return ReturnSucUtils.getRepInfo(gridUserService.getUserInfo(gridTokenVo));
+ public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
+ return gridUserService.getUserInfo(gridTokenVo);
}
}
--
Gitblit v1.8.0