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

zss

10 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

 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