Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-06-17 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml

@@ -17,6 +17,9 @@
            equipment_energy_consumption
        WHERE
            run_date = DATE_SUB(CURRENT_DATE(), INTERVAL 1 DAY)
        <if test="req.name != null and req.name != ''">
            and `name` like concat('%',#{req.name},'%')
        </if>
        GROUP BY
            `code`
        ORDER BY