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

liyong

2026-03-07 408bab8b1c0c10514b8395cff92e47751e4dcdcd

 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