Merge pull request #21 from Andy-Yin/develop1.0

DYL0109

2025-03-21 7ec2e3a7b22c8d68056678b6aa8026db5b23e893

 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