From dc249113553d081aaa26d4d1f3718b5514363131 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 02 七月 2025 23:23:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev

---
 buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
index 723ea1c..0fde279 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
@@ -26,6 +26,7 @@
 
     }
 
+
     @PutMapping("/activityCancel/{activityId}")
     @ApiOperation(value = "鍙栨秷娲诲姩", notes = "鍙栨秷娲诲姩")
     public Result activityCancel(@PathVariable String activityId){

--
Gitblit v1.8.0