From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb
---
app/src/main/res/layout/fragment_me.xml | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 77a3376..9c789dd 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -35,7 +35,6 @@
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginTop="@dimen/dp_16"
- android:text="寮�濮嬭璁′簡"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
@@ -52,14 +51,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
-
- <include
- android:id="@+id/fragment_me_line_message_center_il"
- layout="@layout/fragment_me_line" />
-
- <include
- android:id="@+id/fragment_me_line_user_management_il"
- layout="@layout/fragment_me_line" />
<include
android:id="@+id/fragment_me_line_set_il"
--
Gitblit v1.8.0