test private
Merge branch 'master' of code.dianpingoa.com:f2ei/efte-js
change version
Merge branch 'alpha'