From 07234fed2dc993366fd4c7673d0e8ada90706bd1 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 15 Sep 2025 11:33:45 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
index b32d489..b5bb2f5 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -124,8 +124,7 @@
or p.product_name like concat('%',#{blurry},'%')
or p.product_title like concat('%',#{blurry},'%')
or p.product_description like concat('%',#{blurry},'%')
- or o.orderNum like concat('%',#{blurry},'%')
- or o.order_describe like concat('%',#{blurry},'%')
+ or o.return_num like concat('%',#{blurry},'%')
or o.username like concat('%',#{blurry},'%')
or o.order_num like concat('%',#{blurry},'%'))
</if>
@@ -171,7 +170,7 @@
</select>
<select id="countAll" resultType="java.lang.Long">
select count(1) from (
- select distinct o.*
+ select distinct o.*,
p.product_code, p.product_barcode, p.product_name, p.product_title, p.product_description
from ( select
<include refid="Base_Column_List"/>
--
Gitblit v1.9.3