From 8246ec51e9cf0fdb37a76bc62cac4ac2b3ffc893 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 14 三月 2025 14:49:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
index 26b0197..04d1c08 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
@@ -115,7 +115,8 @@
@ApiOperation("鐝:鏌ヨ浜哄憳鍒楄〃")
@GetMapping("/getUserList")
public Result<?> getUserList(){
- return Result.success(performanceShiftService.getUserList());
+ Map<String, List<Map<String, Object>>> userList = performanceShiftService.getUserList();
+ return Result.success(userList);
}
--
Gitblit v1.9.3