From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/LotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
similarity index 92%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/LotteryEventController.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
index 3c6db96..baa4810 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/LotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
@@ -14,8 +14,8 @@
  * @Date 2025/5/8 18:13
  */
 @RestController
-@RequestMapping("/lotteryEvent")
-public class LotteryEventController {
+@RequestMapping("/mer/lotteryEvent")
+public class MerLotteryEventController {
 	
 	@Resource
 	private ILotteryEventService lotteryEventService;
@@ -23,6 +23,7 @@
 	
 	/**
 	 * 根据开启方式获取活动列表
+	 *
 	 * @param activityType
 	 * @return
 	 */
@@ -33,4 +34,6 @@
 				.eq(LotteryEvent::getDelFlag, 0).last(" and now() between start_time and end_time"));
 		return R.ok(list);
 	}
+	
+	
 }

--
Gitblit v1.7.1