From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
index 564e7d0..84ba649 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
@@ -52,4 +52,7 @@
         recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
         return R.ok();
     }
+
+
+
 }

--
Gitblit v1.7.1