From e290789c592db88cfbffac7ecbdcd8f998e45796 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 11:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index 8d38ddf..fc22dd3 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -79,7 +79,7 @@
@ApiOperation("鏍规嵁瀵硅薄淇℃伅鏌ヨ")
@PostMapping("/queryOne")
@RequiresPermissions("business:salaryparam:query")
- public ApiResponse queryOne(@RequestBody SalaryParam salaryParam) {
+ public ApiResponse<SalaryParam> queryOne(@RequestBody SalaryParam salaryParam) {
SalaryParam data = salaryParamService.findOne(salaryParam);
return ApiResponse.success(data);
}
@@ -91,6 +91,14 @@
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/queryList")
+ @RequiresPermissions("business:salaryparam:query")
+ public ApiResponse<List<SalaryParam>> queryList(@RequestBody SalaryParam salaryParam) {
+ List<SalaryParam> data = salaryParamService.findList(salaryParam);
+ return ApiResponse.success(data);
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
--
Gitblit v1.9.3