From 1bea61102b935d0d5acd3a5ce8f441452a86ff4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
index 6663803..3968773 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
@@ -1,12 +1,10 @@
package com.ruoyi.order.service;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
-import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.pojo.Order;
-
-import java.util.List;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
+import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
+import com.ruoyi.system.api.domain.Order;
/**
* <p>
@@ -18,7 +16,7 @@
*/
public interface IMemberInvoiceRiseService extends IService<MemberInvoiceRise> {
- List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
+ PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
@@ -30,6 +28,6 @@
MemberInvoiceRise getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
- List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
+ PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
}
--
Gitblit v1.7.1