Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-12 b0765ec5be45d6db1993064d5261bf42e94d161f

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

对比新文件
@@ -0,0 +1,47 @@
package com.ruoyi.equipmentenergyconsumption.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@Data
@TableName("electricity_consumption_area")
@ApiModel
public class ElectricityConsumptionArea {

        @TableId(value = "id", type = IdType.AUTO)
        private Long id;

        /**
         * 鍖哄煙鍚嶇О
         */
        @ApiModelProperty("鍖哄煙鍚嶇О")
        @Excel(name = "鍖哄煙鍚嶇О")
        private String areaName;

        /**
         * 鍖哄煙绫诲瀷
         */
        @ApiModelProperty("鍖哄煙绫诲瀷")
        @Excel(name = "鍖哄煙绫诲瀷")
        private String areaType;
        /**
         * 鎺掑簭
         */
        @TableField(fill = FieldFill.INSERT)
        private Long sort;

        /**
         * 鐖剁被id
         */
        @TableField(fill = FieldFill.INSERT)
        private Long fuId;
        /**
         * 绉熸埛id
         */
        @TableField(fill = FieldFill.INSERT)
        private Long tenantId;
}