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

zss

10 天以前 03df670a1dfbcae8031e84e15dff0b77365f0af6

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

@@ -19,25 +19,21 @@
         * 区域名称
         */
        @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