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/activity_personal_data.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml index 9929f29..b18d5e9 100644 --- a/app/src/main/res/layout/activity_personal_data.xml +++ b/app/src/main/res/layout/activity_personal_data.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/text_F5F7FA" - tools:context=".ui.me.PersonalDataActivity"> + tools:context=".ui.me.CPersonalDataActivity"> <include android:id="@+id/toolbar_top_fragment_me_rl" @@ -29,6 +29,9 @@ <include android:id="@+id/personal_data_user_name_il" layout="@layout/general_line" /> + <include + android:id="@+id/personal_data_qr_code_il" + layout="@layout/general_line" /> </LinearLayout> -- Gitblit v1.8.0