From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
index 25e999b..50230c6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
@@ -57,7 +57,6 @@
             <if test="roleType != null and roleType == 3">
                 AND o.agentId = #{objectId}
             </if>
-            AND co.userType = 1
         </where>
         ORDER BY co.createTime
     </select>

--
Gitblit v1.7.1