From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index 846fc8a..249e84b 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -3,8 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 
@@ -19,7 +18,7 @@
  */
 @Data
 @TableName("equipment_energy_consumption")
-@ApiModel
+@Schema
 public class EquipmentEnergyConsumption {
 
     private static final long serialVersionUID = 1L;
@@ -30,28 +29,28 @@
     /**
      * 璁惧缂栧彿
      */
-    @ApiModelProperty("璁惧缂栧彿")
+    @Schema(description = "璁惧缂栧彿")
     @Excel(name = "璁惧缂栧彿")
     private String code;
 
     /**
      * 璁惧鍚嶇О
      */
-    @ApiModelProperty("璁惧鍚嶇О")
+    @Schema(description = "璁惧鍚嶇О")
     @Excel(name = "璁惧鍚嶇О")
     private String name;
 
     /**
      * 棰濆畾鍔熺巼
      */
-    @ApiModelProperty("棰濆畾鍔熺巼")
+    @Schema(description = "棰濆畾鍔熺巼")
     @Excel(name = "棰濆畾鍔熺巼")
     private String powerRating;
 
     /**
      * 瀹為檯鍔熺巼
      */
-    @ApiModelProperty("瀹為檯鍔熺巼")
+    @Schema(description = "瀹為檯鍔熺巼")
     @Excel(name = "瀹為檯鍔熺巼")
     private String powerActual;
 
@@ -59,21 +58,21 @@
     /**
      * 褰撴棩鐢ㄧ數閲�
      */
-    @ApiModelProperty("褰撴棩鐢ㄧ數閲�")
+    @Schema(description = "褰撴棩鐢ㄧ數閲�")
     @Excel(name = "褰撴棩鐢ㄧ數閲�")
     private BigDecimal dayNum;
 
     /**
      * 鏄ㄧ敤鐢甸噺
      */
-    @ApiModelProperty("鏄ㄧ敤鐢甸噺")
+    @Schema(description = "鏄ㄧ敤鐢甸噺")
     @TableField(exist = false)
     private BigDecimal toDayNum;
 
     /**
      * 鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級
      */
-    @ApiModelProperty("鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
+    @Schema(description = "鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
     @TableField(exist = false)
     private BigDecimal avgNum;
 
@@ -81,20 +80,20 @@
     /**
      * 瓒嬪娍
      */
-    @ApiModelProperty("瓒嬪娍")
+    @Schema(description = "瓒嬪娍")
     @TableField(exist = false)
     private String trend;
 
     /**
      * 绱鐢ㄧ數閲�
      */
-    @ApiModelProperty("绱鐢ㄧ數閲�")
+    @Schema(description = "绱鐢ㄧ數閲�")
     @Excel(name = "绱鐢ㄧ數閲�")
     private BigDecimal sumNum;
     /**
      * 杩愯鏃堕棿
      */
-    @ApiModelProperty("杩愯鏃堕棿")
+    @Schema(description = "杩愯鏃堕棿")
     @Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date runDate;
@@ -102,7 +101,7 @@
     /**
      * 姣忔棩闄愬埗鐢甸噺
      */
-    @ApiModelProperty("姣忔棩闄愬埗鐢甸噺")
+    @Schema(description = "姣忔棩闄愬埗鐢甸噺")
     @Excel(name = "姣忔棩闄愬埗鐢甸噺")
     private BigDecimal everyNum;
 
@@ -139,4 +138,7 @@
      *鎵�灞炵敤鐢靛尯鍩焛d
      */
     private Long electricityConsumptionAreaId;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3