From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 35d06f0..775ab8b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -241,7 +241,7 @@
 
     @RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
     @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "编辑商户")
-    @ApiOperation(value = "平台编辑商户")
+    @ApiOperation(value = "平台编辑商户【2.0】")
     public R createMgtShop(@Validated @RequestBody MgtEditShopDto mgtEditShopDto) {
         Long userId = SecurityUtils.getUserId();
         mgtEditShopDto.setUserId(userId);
@@ -250,7 +250,7 @@
     }
 
     @RequestMapping(value = "/getMgtShopInfo", method = RequestMethod.POST)
-    @ApiOperation(value = "获取商户详情")
+    @ApiOperation(value = "获取商户详情【2.0】")
     public R<MgtShopInfoVo> getMgtShopInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
         MgtShopInfoVo mgtShopInfoVo = shopService.getMgtShopInfo(Long.valueOf(mgtBaseGetDto.getId()));
         return R.ok(mgtShopInfoVo);

--
Gitblit v1.7.1