# Conflicts:
#   package.json
#   src/api/service/base.js
#   src/pages/user/login/login.js