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

liyong

19 小时以前 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

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