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