From 8d0850541f66e843849e2118d0c8057e4d080ba1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 九月 2024 09:18:29 +0800
Subject: [PATCH] 设置菜单语言从语言文件中获取

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 47b1344..06e50a0 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -54,7 +54,7 @@
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         left join sd.`order` o on o.order_id=fol.order_id
         <where>
-            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and o.delivery = 0
+            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
             <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
                 and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
             </if>

--
Gitblit v1.8.0