Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-04-23 a5e08addf5745b587d54c7536996259d5505261a

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

@@ -40,4 +40,11 @@
         */
        @TableField(fill = FieldFill.INSERT)
        private Long tenantId;
    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

}