From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
index 0c0047c..bd15109 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
@@ -2,21 +2,19 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
-import com.ruoyi.order.domain.pojo.Order;
+import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.ruoyi.order.service.IOrderService;
+import com.ruoyi.system.api.domain.Order;
import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* <p>
@@ -39,7 +37,7 @@
@PostMapping("/getMemberInvoiceRiseList")
@ResponseBody
@ApiOperation(value = "获取用户发票抬头")
- public R<List<MemberInvoiceRise>> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ public R<PageDTO<MemberInvoiceRise>> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseList(memberInvoiceRiseDTO));
}
@@ -84,7 +82,7 @@
@PostMapping("/getOrderList")
@ResponseBody
@ApiOperation(value = "获取用户已开票和未开票列表")
- public R<List<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ public R<PageDTO<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getOrderList(memberInvoiceRiseDTO));
}
}
--
Gitblit v1.7.1