From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
index 39483f2..713a66a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
@@ -10,8 +10,17 @@
public class StatisticsBean implements Serializable {
private String fieldName;// 鎻忚堪
- private int fieldValue;//鍊�
+ private String fieldValue;//鍊�
private String time;// 鏃堕棿
+ private boolean future;//琛ㄧず鏄惁鏄湭鏉ユ椂闂达紙true琛ㄧず鏈潵鏃堕棿锛�
+
+ public boolean isFuture() {
+ return future;
+ }
+
+ public void setFuture(boolean future) {
+ this.future = future;
+ }
public String getFieldName() {
return fieldName == null ? "" : fieldName;
@@ -21,11 +30,11 @@
this.fieldName = fieldName;
}
- public int getFieldValue() {
- return fieldValue;
+ public String getFieldValue() {
+ return fieldValue == null ? "" : fieldValue;
}
- public void setFieldValue(int fieldValue) {
+ public void setFieldValue(String fieldValue) {
this.fieldValue = fieldValue;
}
--
Gitblit v1.8.0