From 4936ba718f4ec2d069a9c28d07215573ed8548aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 10:12:10 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 3 ---
1 files changed, 0 insertions(+), 3 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 9beae3e..62698ab 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
@@ -103,11 +103,9 @@
@PostMapping("/timer/platformJob/sendUnFinishNotice")
ApiResponse sendUnFinishNotice();
-<<<<<<< HEAD
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙拌嚜鍔ㄥ彨鍙�")
@PostMapping("/timer/platformJob/autoPlatformCallCar")
ApiResponse autoPlatformCallCar();
-=======
@ApiOperation("銆愰拤閽夋暟鎹�戦拤閽塼oken瀹氭椂鍣ㄦ帴鍙�")
@PostMapping("/timer/dingTalkToken/updateDingTalkTokenOrigin")
ApiResponse updateDingTalkTokenOrigin() throws Exception;
@@ -126,5 +124,4 @@
@ApiOperation("銆愭柇璺櫒銆戝紑鍚畾鏃惰繙绋嬫帶鍒舵柇璺櫒鍒嗛椄")
@PostMapping("/timer/duanluqi/autoCloseCmd")
ApiResponse autoCloseCmd();
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
}
--
Gitblit v1.9.3