From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/res/layout/activity_house_list_edit.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_house_list_edit.xml b/app/src/main/res/layout/activity_house_list_edit.xml
index d16924d..fb9f804 100644
--- a/app/src/main/res/layout/activity_house_list_edit.xml
+++ b/app/src/main/res/layout/activity_house_list_edit.xml
@@ -8,7 +8,7 @@
tools:context=".ui.powerstation.HouseListEditActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
+ android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
--
Gitblit v1.8.0