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/service/impl/XpClockInServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
index 3c95635..8780f80 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
@@ -177,7 +177,7 @@
}
@Override
- public R<Integer> clockOut(ClockDTO dto) {
+ public R<String> clockOut(ClockDTO dto) {
XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
if (null == xpCheckLocation) {
@@ -321,7 +321,6 @@
xpClockIn.setAppUserId(null);
this.updateById(xpClockIn);
sendAgreementUpdateNotification(now);
- return R.ok(xpClockIn.getClockOutResult());
}
private String buildAttendanceLockKey(Long appUserId, LocalDate attendanceDate) {
--
Gitblit v1.7.1