Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-04-18 aad10c063fbdebf817b902bbdc5122a693be228b

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java

@@ -116,7 +116,7 @@
    }

    @Override
    public R<String> clockIn(ClockDTO dto) {
    public R<Integer> clockIn(ClockDTO dto) {

        XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
        if (null == xpCheckLocation) {
@@ -160,11 +160,11 @@
        }
        this.save(xpClockIn);
        sendAgreementUpdateNotification(now);
        return R.ok();
        return R.ok(xpClockIn.getClockInResult());
    }

    @Override
    public R<String> clockOut(ClockDTO dto) {
    public R<Integer> clockOut(ClockDTO dto) {

        XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
        if (null == xpCheckLocation) {
@@ -214,7 +214,7 @@
        xpClockIn.setAppUserId(null);
        this.updateById(xpClockIn);
        sendAgreementUpdateNotification(now);
        return R.ok();
        return R.ok(xpClockIn.getClockOutResult());
    }

    @Override