[develop]new function
Merge branch 'feature' into develop
m_menu.js[develop]
rebase conflict
feature add2
develop added
rebase conflict
m_memu_develop
Merge branch 'develop' of https://github.com/monolifeYw/gitTest2 into develop
feature merge