From cbd0384e4e68c3d838981aba0602c6d76fdc091b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 四月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch '1.5.1_google' into 1.5.2
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/DataOverBean.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DataOverBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DataOverBean.java
index 23fde4d..2225045 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DataOverBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DataOverBean.java
@@ -6,10 +6,9 @@
* 缁熻姒傝鏁版嵁瀹炰綋绫�
*/
public class DataOverBean implements Serializable {
-
private String installedCapacity;//瑁呮満瀹归噺
private String power;//鍙戠數鍔熺巼
- private String powerRatio;//鍙戠數鍔熺巼鍗犳瘮(褰撴棩鍙戠數鍔熺巼/瑁呮満瀹归噺 * 100% )
+ private String powerRatio;//浜戠璁＄畻,鍙戠數鍔熺巼鍗犳瘮(褰撴棩鍙戠數鍔熺巼/瑁呮満瀹归噺 * 100%)
private String todayElectricity;//褰撴棩鍙戠數閲�
private String monthElectricity;//褰撴湀鍙戠數閲�
private String yearElectricity;//褰撳勾鍙戠數閲�
@@ -32,7 +31,7 @@
}
public String getPowerRatio() {
- return powerRatio == null ? "" : getPowerRatio();
+ return powerRatio == null ? "" : powerRatio;
}
public void setPowerRatio(String powerRatio) {
--
Gitblit v1.8.0