解决library冲突
update index
merge origin
Merge branch 'dev' of https://github.com/JimmyET/EasyhomeFramework into dev