From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
index 97ece7e..75493df 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
@@ -1,11 +1,11 @@
 package com.ruoyi.order.service;
 
-import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.order.dto.MemberInvoiceDTO;
-import com.ruoyi.order.domain.pojo.MemberInvoice;
 import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.controller.management.dto.MgtMemberInvoicingQuery;
+import com.ruoyi.order.controller.management.vo.MgtMemberInvoicingVO;
+import com.ruoyi.order.domain.MemberInvoice;
+import com.ruoyi.order.dto.MemberInvoiceDTO;
 
 /**
  * <p>
@@ -20,4 +20,5 @@
 
    PageDTO<MemberInvoice> getMemberInvoiceList(MemberInvoiceDTO memberInvoiceDTO);
 
+    PageDTO<MgtMemberInvoicingVO> getMemberInvoicingPage(MgtMemberInvoicingQuery query);
 }

--
Gitblit v1.7.1