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

zss

2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe

 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();
}