From f51be3cd3f96e4f8875fad0d6bb13d9ebcca9f93 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 21 三月 2025 14:58:42 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems
---
zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
index 3d4e35e..1777718 100644
--- a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
@@ -51,7 +51,7 @@
</foreach>
AND di.time_type = #{timeType}
<if test="indexStorageId !='' and indexStorageId !=null">
- and ci.equipment=#{indexStorageId}
+ and ci.energy_id=#{indexStorageId}
</if>
) aa
GROUP BY
--
Gitblit v1.9.3