Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-06-04 3f7a3aefe2965459aed169383b285fba400cfe8c

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -49,7 +49,7 @@
    }

    @RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
    @ApiOperation(value = "创建商户")
    @ApiOperation(value = "平台编辑商户")
    public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
        Long userId = SecurityUtils.getUserId();
        mgtEditShopDto.setUserId(userId);