From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 95f3105..37902fa 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
@@ -24,26 +23,26 @@
@RestController
@RequestMapping("/personalAttendanceRecords")
@Tag(name = "浜哄憳鎵撳崱绛惧埌")
-public class PersonalAttendanceRecordsController extends BaseController {
+public class PersonalAttendanceRecordsController {
@Resource
private PersonalAttendanceRecordsService personalAttendanceRecordsService;
@Operation(summary = "鏂板鎵撳崱绛惧埌")
@PostMapping("")
- public R<?> add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
+ public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
}
@Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
@GetMapping("/listPage")
- public R<?> listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
+ public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
}
@Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
@GetMapping("/today")
- public R<?> todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
+ public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
}
@Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
--
Gitblit v1.9.3