From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
new file mode 100644
index 0000000..baba550
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -0,0 +1,59 @@
+package com.ruoyi.equipmentenergyconsumption.pojo;
+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 lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("energy_period")
+@ApiModel
+public class EnergyPeriod {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 鏃ユ湡
+     */
+    @ApiModelProperty("鏃ユ湡")
+    @Excel(name = "鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date date;
+    /**
+     * 鍗曚环
+     */
+    @ApiModelProperty("鍗曚环")
+    @Excel(name = "鍗曚环")
+    private Double price;
+    /**
+     * 绉熸埛id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+    /**
+     * 宄版
+     */
+    @ApiModelProperty("宄版")
+    @Excel(name = "宄版")
+    private Double peak;
+    /**
+     * 璋锋
+     */
+    @ApiModelProperty("璋锋")
+    @Excel(name = "璋锋")
+    private Double valley;
+    /**
+     * 骞虫
+     */
+    @ApiModelProperty("骞虫")
+    @Excel(name = "骞虫")
+    private Double flat;
+    /**
+     * 灏栨
+     */
+    @ApiModelProperty("灏栨")
+    @Excel(name = "灏栨")
+    private Double sharp;
+}

--
Gitblit v1.9.3