Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

 src/main/java/com/ruoyi/purchase/mapper/InvoicePurchaseMapper.java

@@ -22,5 +22,7 @@

    IPage<InvoicePurchaseReportDto> selectPurchaseReport(IPage page, @Param("c") InvoicePurchaseReportDto invoicePurchaseReportDto);

    List<VatDto> listVat(Page page, InvoicePurchase invoicePurchase);
    IPage<VatDto> listVat(Page page,@Param("month") String month);

    List<VatDto>  listVat1();
}