Merge branch 'feature/upgrade' of http://git.quantgroup.cn/ui/merchant-manage-ui into feature/upgrade
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.