修正更加智能的参数merge
Merge branch 'master' of https://github.com/wayfind/flex-combo
version up