From 6a571d05a20840fcb9faf0026ea7abd81700fee3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:05:57 +0800
Subject: [PATCH] # 工资表配置表 联调修改

---
 server/src/main/java/doumeemes/api/business/SalaryParamController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
index 899774b..d405ec3 100644
--- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java
+++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
@@ -7,6 +7,7 @@
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.model.PageData;
 import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.business.vo.SalaryParamVO;
 import doumeemes.dao.ext.dto.SalaryParamDTO;
 import doumeemes.service.business.SalaryParamService;
 import io.swagger.annotations.Api;
@@ -70,8 +71,8 @@
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-    @RequiresPermissions("business:salaryparam:query")
-    public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
+//    @RequiresPermissions("business:salaryparam:query")
+    public ApiResponse<PageData<SalaryParamVO>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
         return ApiResponse.success(salaryParamService.findPage(pageWrap));
     }
 
@@ -79,7 +80,7 @@
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:salaryparam:exportExcel")
     public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
+        ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")

--
Gitblit v1.9.3