From 633c06e7e43c9700b0e410f0275b9b0ece1f9759 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期二, 25 三月 2025 10:02:59 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems
---
zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPrice.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPrice.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPrice.java
index 58ac0cb..1bf0ecd 100644
--- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPrice.java
+++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPrice.java
@@ -46,12 +46,22 @@
@Excel(name = "鏃舵缁撴潫鏃堕棿", width = 30, dateFormat = "HH:mm:ss")
@NotNull(message = "鏃舵缁撴潫鏃堕棿涓嶈兘涓虹┖")
private Date stopTime;
+// @Excel(name = "鑼冨洿绫诲瀷瀛楀吀鍊糲ost_range_type")
+// private String rangeType;
/** 鐢典环 */
@Excel(name = "鐢典环")
@NotEmpty(message = "鐢典环涓嶈兘涓虹┖")
private BigDecimal effecticityPrice;
-
+
+// public String getRangeType() {
+// return rangeType;
+// }
+//
+// public void setRangeType(String rangeType) {
+// this.rangeType = rangeType;
+// }
+
public void setId(String id)
{
this.id = id;
--
Gitblit v1.9.3