Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

gongchunyi

22 小时以前 520a715610bd67a6401e989ada8b1c43a312163b

 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java

@@ -124,6 +124,12 @@
        return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
    }

    @PostMapping("/exportStockInventoryPage")
    @Operation(summary = "库存报表导出")
    public void exportStockInventoryPage(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
        stockInventoryService.exportStockInventoryPage(response,stockInventoryDto);
    }

    @GetMapping("/stockInAndOutRecord")
    @Operation(summary = "统计各个产品的入库和出库记录")
    public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {