Merge remote-tracking branch 'origin/pim_yys'

maven

7 天以前 2e85e2dda945ca269d87b7f1f6147246be9accfa

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

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