Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

6 天以前 8a71194e0cd81a39637bc9c5adbd8c9d1405f155

 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