Merge remote-tracking branch 'origin/master'

rk

12 小时以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

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

@@ -98,6 +98,13 @@
        return ApiResponse.success(goodsorderService.findPage(pageWrap));
    }

    @ApiOperation("分页查询")
    @PostMapping("/pageShop")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse<PageData<Goodsorder>> findPageShop (@RequestBody PageWrap<Goodsorder> pageWrap) {
        return ApiResponse.success(goodsorderService.findPageShop(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:goodsorder:exportExcel")