Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC

# Conflicts: # components/FluxUI/ui_event_homePage.c
2025-04-22 14:07:35 +08:00 · 2025-04-22 14:07:35 +08:00 · 3f617dde08
commit 3f617dde08
parent 003fdbc366 8cbdd945a8
1 changed files with 1 additions and 0 deletions
--- 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
 }