From c1bb3dd69c4d68f3f0787b59881ca258707b8cea Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 14 Aug 2025 10:34:36 +0800
Subject: [PATCH] feat(websocket): 添加 Netty WebSocket 聊天功能基础版本,URL:http://localhost:8085/febs/pages/websocket/chat.html

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c310823..4a0eaa0 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
         <result column="take_code" property="takeCode" />
         <result column="take_unique_code" property="takeUniqueCode" />
         <result column="delivery_state" property="deliveryState" />
+        <result column="delivery_state" property="deliveryState" />
         <result column="is_home" property="isHome" />
         <result column="is_free" property="isFree" />
         <result column="del_flag" property="delFlag" />
@@ -451,9 +452,6 @@
             </if>
             <if test="record.status == 5">
                 and a.status = 7 or b.state in (2,3)
-            </if>
-            <if test="record.orderType != null">
-                and a.order_type=#{record.orderType}
             </if>
         </where>
         order by a.created_time desc

--
Gitblit v1.9.1