From 44df47f684ec9e4ac1c26b89465a9d179b322b02 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 16 四月 2024 10:32:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 5955ab9..8abc46d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -324,8 +324,9 @@
<if test="lineId != null and lineId != ''">
and t1.line_id = #{lineId}
</if>
- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc
+ order by t1.create_time desc
</select>
+<!-- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc-->
<select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
select t9.* from ( select
t1.id id,
--
Gitblit v1.9.3