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

gongchunyi

2026-04-13 f4d6d9d7ae1d0f1af6937dd7a2761056e46611c2

 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;

}