From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
index 05262a3..2add55e 100644
--- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
+++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
@@ -32,6 +32,57 @@
@Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
+ private String remark;
+
+
+// /** 鏄惁闃舵浠锋牸0鍚�1鏄� */
+// @Excel(name = "鏄惁闃舵浠锋牸0鍚�1鏄�")
+// private String type;
+//
+// /** 绛栫暐缂栫爜 */
+// @Excel(name = "绛栫暐缂栫爜")
+// private String tacticsNumber;
+//
+// /** 绛栫暐鍚嶇О */
+// @Excel(name = "绛栫暐鍚嶇О")
+// private String tacticsName;
+//
+// /** 鑳芥簮鍝佺 */
+// @Excel(name = "鑳芥簮鍝佺")
+// private Integer energyType;
+
+// public void setType(String type) {
+// this.type = type;
+// }
+//
+// public void setTacticsNumber(String tacticsNumber) {
+// this.tacticsNumber = tacticsNumber;
+// }
+//
+// public void setTacticsName(String tacticsName) {
+// this.tacticsName = tacticsName;
+// }
+//
+// public void setEnergyType(Integer energyType) {
+// this.energyType = energyType;
+// }
+//
+// public String getType() {
+// return type;
+// }
+//
+// public String getTacticsNumber() {
+// return tacticsNumber;
+// }
+//
+// public String getTacticsName() {
+// return tacticsName;
+// }
+//
+// public Integer getEnergyType() {
+// return energyType;
+// }
+
public void setId(String id)
{
this.id = id;
@@ -73,4 +124,14 @@
.append("remark", getRemark())
.toString();
}
+
+ @Override
+ public String getRemark() {
+ return remark;
+ }
+
+ @Override
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
}
--
Gitblit v1.9.3