From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/res/layout/null_data_view.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/null_data_view.xml b/app/src/main/res/layout/null_data_view.xml
index 24a235e..5b7d34f 100644
--- a/app/src/main/res/layout/null_data_view.xml
+++ b/app/src/main/res/layout/null_data_view.xml
@@ -20,7 +20,6 @@
android:layout_height="22.5dp"
android:layout_marginTop="11.5dp"
android:gravity="center"
- android:text="鏁版嵁涓虹┖,璧跺揩鍒涘缓涓�涓惂"
android:textColor="@color/text_7C8590"
android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
--
Gitblit v1.8.0