From 25500eee9bb9895eb18d56eae972d283dce72726 Mon Sep 17 00:00:00 2001
From: ipason <ipason@yuwell.com>
Date: Tue, 22 Apr 2025 14:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E4=BF=AE=E6=94=B9=E4=BA=86=E8=A6=81?=
 =?UTF-8?q?=E7=BB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/FluxUI/ui_event_homePage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/FluxUI/ui_event_homePage.c b/components/FluxUI/ui_event_homePage.c
index 43734e3..3909693 100644
--- a/components/FluxUI/ui_event_homePage.c
+++ b/components/FluxUI/ui_event_homePage.c
@@ -484,5 +484,5 @@ void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e)
 #if LOG_RECORD_ENABLE
     example_write_log("on_dropdownDeviceType_valueChanged 设备类型修改成功");
 #endif	
-
+//冲突1
 }
\ No newline at end of file