From e094b18b33bde8fa171b83ea23315e8b65ea47e5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 12 Feb 2026 15:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10

---
 src/main/java/com/nq/dao/OrderEchoMapper.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/dao/OrderEchoMapper.java b/src/main/java/com/nq/dao/OrderEchoMapper.java
index 2f7cc55..751b980 100644
--- a/src/main/java/com/nq/dao/OrderEchoMapper.java
+++ b/src/main/java/com/nq/dao/OrderEchoMapper.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nq.pojo.OrderEchoBean;
+import com.nq.pojo.OrderEchoOut;
+import com.nq.pojo.reponse.OrderEChoReponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -13,8 +15,8 @@
 
 
 
-    List<OrderEchoBean> queryByUserId(Integer id);
+    List<OrderEchoOut> queryByUserId(Integer id);
 
 
-    List<OrderEchoBean> queryAll();
+    List<OrderEChoReponse> queryAll();
 }

--
Gitblit v1.9.3