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

yaowanxin

2025-08-11 1b5604f8a88000e2f51d4c989fd179989468ee67

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

@@ -28,6 +28,11 @@
        @ApiModelProperty("区域类型")
        @Excel(name = "区域类型")
        private String areaType;
        /**
         * 排序
         */
        @TableField(fill = FieldFill.INSERT)
        private Long sort;

        /**
         * 父类id