Release/2.0 See merge request !2
fix bug 修复线上 二个小bug See merge request !1
# Conflicts: # config/common.js