From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev

---
 app/src/main/res/layout/fragment_home_page.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 80bdd5d..9d227d0 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -146,7 +146,7 @@
                             android:layout_below="@+id/info_rl1_text1_tv"
                             android:layout_alignStart="@+id/info_rl1_text1_tv"
                             android:layout_marginTop="3dp"
-                            android:text="@string/my_power_station_installed_capacity" />
+                            android:text="@string/string_capacity" />
 
                         <TextView
                             android:id="@+id/info_rl1_text3_tv"

--
Gitblit v1.8.0