From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:27:12 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
index 43c48db..53e1556 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -143,7 +143,11 @@
<include refid="Base_Column_List"/>
from sh_order_return as o
<include refid="Where_sql"/>
- order by o.return_id desc ) o
+ order by o.return_id desc
+ <if test="criteria.offset != null">
+ limit #{criteria.offset}, #{criteria.size}
+ </if>
+ ) o
left join sh_order_return_product_snapshot as p on p.return_num = o.return_num
<include refid="Where_Sql_Product"/>
order by o.order_id desc
--
Gitblit v1.9.3