From 15335f28e9c52b0eeafb622c2aec08d22ad4e52f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:59:26 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 5a884ca..1323ef8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -299,7 +299,7 @@
toc.goods_num goodsNum,
toc.shop_id shopId,
toc.create_time createTime,
- toc.cancel_type cancelType,
+ toc.cancel_type cancelType
FROM t_order toc
WHERE toc.del_flag = 0
<if test="param.userId != null">
--
Gitblit v1.7.1