Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems

ustcyc

2025-03-21 f51be3cd3f96e4f8875fad0d6bb13d9ebcca9f93

 zhitan-system/src/main/resources/mapper/keyequipment/DailyKeyEquipmentMapper.xml

@@ -59,7 +59,7 @@
        AND di.index_id IN <foreach item="indexId" index="index" collection="indexIds"  open="(" separator="," close=")">#{indexId} </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