jarvis/FluxDC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	components/FluxUI/ui_event_homePage.c
This commit is contained in:
vmWin10 2025-04-22 14:07:35 +08:00
commit 3f617dde08
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/FluxUI/ui_event_homePage.c
View File

@ -485,4 +485,5 @@ void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e)
example_write_log("on_dropdownDeviceType_valueChanged 设备类型修改成功"); example_write_log("on_dropdownDeviceType_valueChanged 设备类型修改成功");
#endif #endif
//冲突1
} }