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/dao/OrderEchoMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/dao/OrderEchoMapper.java b/src/main/java/com/nq/dao/OrderEchoMapper.java
index 06b4115..751b980 100644
--- a/src/main/java/com/nq/dao/OrderEchoMapper.java
+++ b/src/main/java/com/nq/dao/OrderEchoMapper.java
@@ -2,6 +2,7 @@
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;
@@ -14,7 +15,7 @@
- List<OrderEchoBean> queryByUserId(Integer id);
+ List<OrderEchoOut> queryByUserId(Integer id);
List<OrderEChoReponse> queryAll();
--
Gitblit v1.9.3