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

maven

4 天以前 2a9c3934bb093c978a54a1c3e220e6a120855e77

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java

@@ -138,6 +138,5 @@
    /**
     *所属用电区域id
     */
    @TableField(fill = FieldFill.INSERT)
    private Long electricityConsumptionAreaId;
}