From 824c3ca56509e9404ce4e96dd3c736ebb7e7bd0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 10 Oct 2022 15:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/web/SalaryArchiveController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java
index 0e6f6b6f7..bf58af770 100644
--- a/src/com/engine/salary/web/SalaryArchiveController.java
+++ b/src/com/engine/salary/web/SalaryArchiveController.java
@@ -87,7 +87,7 @@ public class SalaryArchiveController {
     @Produces(MediaType.APPLICATION_JSON)
     public String pendingList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Long>>(user).run(getSalaryArchiveWrapper(user)::pendingList, queryParam);
+        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::pendingList, queryParam);
     }
 
 //
@@ -131,7 +131,7 @@ public class SalaryArchiveController {
 //    }
 
     /**
-     * 定薪列表
+     * 发薪列表
      *
      * @param queryParam
      * @return
@@ -141,7 +141,7 @@ public class SalaryArchiveController {
     @Produces(MediaType.APPLICATION_JSON)
     public String fixedList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Long>>(user).run(getSalaryArchiveWrapper(user)::fixedList, queryParam);
+        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::fixedList, queryParam);
     }
 
 
@@ -156,7 +156,7 @@ public class SalaryArchiveController {
     @Produces(MediaType.APPLICATION_JSON)
     public String suspendList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Long>>(user).run(getSalaryArchiveWrapper(user)::suspendList, queryParam);
+        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::suspendList, queryParam);
     }
 
 //    /**
@@ -209,7 +209,7 @@ public class SalaryArchiveController {
     @Produces(MediaType.APPLICATION_JSON)
     public String stopList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Long>>(user).run(getSalaryArchiveWrapper(user)::stopList, queryParam);
+        return new ResponseResult<SalaryArchiveQueryParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::stopList, queryParam);
     }