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

zss

8 天以前 14de446d42a23f8823f56ef79214e0d0d634adaa

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

@@ -52,6 +52,13 @@
        return AjaxResult.success(result);
    }

    @GetMapping("/listPageBySemiProduct")
    @Log(title = "生产出库-出库台账-出库查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
        IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageBySemiProduct(page, procurementDto);
        return AjaxResult.success(result);
    }

    @GetMapping("/listPageByCustom")
    @Log(title = "自定义出库-出库台账-出库查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {