From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev

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

diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml
index d193c36..bdc9b73 100644
--- a/app/src/main/res/layout/activity_cpower_station.xml
+++ b/app/src/main/res/layout/activity_cpower_station.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bj"
+    android:background="@color/text_FF000000"
     tools:context=".ui.CPowerStationActivity">
 
-<!--    <TextView-->
+    <!--    <TextView-->
     <!--        android:layout_width="match_parent"-->
     <!--        android:layout_height="wrap_content"-->
     <!--        android:layout_marginStart="@dimen/dp_5"-->

--
Gitblit v1.8.0