From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetail.java | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetail.java b/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetail.java
new file mode 100644
index 0000000..aa0d8ab
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetail.java
@@ -0,0 +1,93 @@
+package com.ruoyi.energy.pojo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+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.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 11:22:20
+ */
+@Getter
+@Setter
+@TableName("energy_consumption_detail")
+@ApiModel(value = "EnergyConsumptionDetail瀵硅薄", description = "鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁�")
+@ExcelIgnoreUnannotated
+public class EnergyConsumptionDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("澶栨鍏宠仈鑳芥簮绫诲瀷id")
+ private Integer energyId;
+
+ @ApiModelProperty("鍔炲叕/鐢熶骇")
+ @Excel(name = "鑳借�楀満鏅�")
+ private String type;
+
+ @ApiModelProperty("鎶勮〃浣嶇疆")
+ private String meterReadingLocation;
+
+ @ApiModelProperty("鎶勮〃鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏃ユ湡")
+ private LocalDate meterReadingDate;
+
+ @ApiModelProperty("璧风爜")
+ @Excel(name = "璧风爜")
+ private BigDecimal startCode;
+
+ @ApiModelProperty("姝㈢爜")
+ @Excel(name = "姝㈢爜")
+ private BigDecimal stopCode;
+
+ @ApiModelProperty("鐢ㄩ噺")
+ @Excel(name = "鐢ㄩ噺")
+ private BigDecimal dosage;
+
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓鑰�")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("鏇存柊鑰�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+}
--
Gitblit v1.9.3