From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/java/com/nq/service/IEchoServices.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/service/IEchoServices.java b/src/main/java/com/nq/service/IEchoServices.java
index 8c4d31f..5e5d436 100644
--- a/src/main/java/com/nq/service/IEchoServices.java
+++ b/src/main/java/com/nq/service/IEchoServices.java
@@ -2,6 +2,7 @@
import com.nq.pojo.EChoBean;
import com.nq.pojo.OrderEchoBean;
+import com.nq.pojo.OrderEchoOut;
import com.nq.pojo.reponse.OrderEChoReponse;
import javax.servlet.http.HttpServletRequest;
@@ -17,7 +18,7 @@
boolean buyECho(String eId, BigDecimal money, HttpServletRequest request);
- List<OrderEchoBean> queryOrderEcho(HttpServletRequest request);
+ List<OrderEchoOut> queryOrderEcho(HttpServletRequest request);
List<OrderEChoReponse> queryALLOrderEcho();
--
Gitblit v1.9.3