From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 09:59:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index cb818f9..c6b666b 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -1,6 +1,6 @@
package com.doumee.jobs.fegin;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -73,9 +73,15 @@
@ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈡暟鎹嵆灏嗚秴鏃堕璀�")
@GetMapping("/timer/visit/visitTimeOut")
ApiResponse visitTimeOut() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈢敵璇峰緟瀹℃壒璁板綍鎴鏃堕棿宸茶繃鑷姩鍙栨秷棰勭害")
+ @GetMapping("/timer/visit/visitNoCheckCancel")
+ ApiResponse visitNoCheckCancel() ;
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙板仠闈犺秴鏃舵姤璀︿笟鍔�")
@GetMapping("/timer/platformJob/platformJobTimer")
ApiResponse platformJobTimer();
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙版鏌ョ數瀛愰攣涓婇攣鐘舵��")
+ @GetMapping("/timer/platformJob/platformCheckWmsLockStatus")
+ ApiResponse platformCheckWmsLockStatusTimer();
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁綔涓氳秴鏃舵姤璀︿笟鍔�")
@GetMapping("/timer/platformJob/platformJobWorkTimeOut")
ApiResponse platformJobWorkTimeOut();
--
Gitblit v1.9.3