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 | 13 +++++++++++++
1 files changed, 13 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 3cd8115..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,9 @@
@Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
+ private String remark;
+
+
// /** 鏄惁闃舵浠锋牸0鍚�1鏄� */
// @Excel(name = "鏄惁闃舵浠锋牸0鍚�1鏄�")
// private String type;
@@ -121,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