From 84b131de4a1deb526066fc0f7e7514ac43838bf8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 08 八月 2026 16:16:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

---
 src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index ad43b6c..4b015bc 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -34,12 +34,14 @@
 
     @GetMapping("/listPage")
     @ApiOperation("鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
+    @Log(title = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
         return staffSalaryMainService.listPage(page, staffSalaryMain);
     }
 
     @ApiOperation("閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
     @PostMapping("/calculateSalary")
+    @Log(title = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�", businessType = BusinessType.UPDATE)
     public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
         return staffSalaryMainService.calculateSalary(calculateSalaryDto);
     }

--
Gitblit v1.9.3