Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

2 天以前 94e23a3d587846f10ea9517bd2e6705093d6a99a

 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java

@@ -237,8 +237,8 @@

    @GetMapping("/listPageProductionStock")
    @Log(title = "库存管理-成品库存", businessType = BusinessType.OTHER)
    public AjaxResult listPageProductionStock(Page page) {
        IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page);
    public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
        IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page,procurementDto);
        return AjaxResult.success(result);
    }
}