Merge remote-tracking branch 'origin/master'

zss

19 小时以前 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

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