Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

7 天以前 51c806f81b4498b2196025c97a94c51b1bb3eeb9

 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