From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:12:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 2d42f48..d2a9d9c 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
@@ -69,7 +69,7 @@
@RequestMapping(value = "/exportPageMgtShop", method = RequestMethod.POST)
@ApiOperation(value = "导出商户列表")
- public void exportPageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
+ public void exportPageMgtShop(MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
Page<MgtShopPageVo> page = new Page<>();
page.setSize(2000);
page.setCurrent(1);
@@ -171,7 +171,7 @@
@RequestMapping(value = "/exportPageMgtShopSuggest", method = RequestMethod.POST)
@ApiOperation(value = "导出商户建议列表")
- public void exportPageMgtShopSuggest(@RequestBody MgtShopSuggestPageDto mgtShopSuggestPageDto, HttpServletResponse response) {
+ public void exportPageMgtShopSuggest(MgtShopSuggestPageDto mgtShopSuggestPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtShopSuggestPageDto.setUserId(userId);
Page<MgtShopSuggestPageVo> page = new Page<>();
@@ -254,7 +254,7 @@
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
@Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
- public R mgtShopAuth(@RequestBody MgtShopAuthDto mgtShopAuthDto) {
+ public R mgtShopAuth(@Validated @RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
mgtShopAuthDto.setUserId(userId);
shopService.mgtShopAuth(mgtShopAuthDto);
--
Gitblit v1.7.1