Merge remote-tracking branch 'origin/master'

doum

12 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java

@@ -73,7 +73,7 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:shop:update")
    public ApiResponse updateById(@RequestBody Shop shop) {
    public ApiResponse updateById(@RequestBody Shop shop) throws Exception {
        shopService.updateById(shop);
        return ApiResponse.success(null);
    }