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

yaowanxin

6 天以前 ac135b66a5ab9f2f74c55961066974e815b88e9a

 src/main/java/com/ruoyi/purchase/service/IInvoicePurchaseService.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
import com.ruoyi.purchase.dto.VatDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;

import java.io.IOException;
@@ -30,5 +31,5 @@

    IPage<InvoicePurchaseReportDto> listPurchaseReport(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto);

    IPage<InvoicePurchase> listVat(Page page, InvoicePurchase invoicePurchase);
    IPage<VatDto> listVat(Page page,String month);
}