From 40c1c6d5aa4f8d1d71a2bdb957e5a7a25429f22d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 15:07:31 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
index 2b1f46f..54920ac 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
@@ -66,7 +66,7 @@
@ApiOperation(value = "下班打卡", tags = "运维APP-排班与考勤")
@PostMapping("/maintenance-app/api/v1/clock/clockOut")
- public R<Integer> clockOut(@RequestBody ClockDTO dto) {
+ public R<String> clockOut(@RequestBody ClockDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
dto.setOperationsUserId(id);
return xpClockInService.clockOut(dto);
--
Gitblit v1.7.1