From 2b1d60053f8ff0db95dc5a1656daed64b7ae776e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 09:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index af20c8f..a27e759 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -75,7 +75,7 @@
         visitsService.updateById(visits);
         return ApiResponse.success(null);
     }
-    @ApiOperation("鍙栨秷棰勭害")
+    @ApiOperation("鎵嬪姩绛剧")
     @GetMapping("/visitCancel")
     @CloudRequiredPermission("business:visits:cancel")
     public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
@@ -83,6 +83,21 @@
         return ApiResponse.success(null);
     }
 
+
+    /**
+     * 2025-3-25 14:14:34  鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+     * @param visitId
+     * @param token
+     * @return
+     */
+    @ApiOperation("鍙栨秷棰勭害")
+    @GetMapping("/visitsCancel")
+    @CloudRequiredPermission("business:visits:cancel")
+    public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        visitsService.visitsCancel(visitId);
+        return ApiResponse.success(null);
+    }
+
     @ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾璁垮鏁版嵁")
     @PostMapping("/syncByDate")
     @CloudRequiredPermission("business:visits:sync")

--
Gitblit v1.9.3