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

maven

8 天以前 259e978c64b36f57aa1959c6d760416b86b26c34

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

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