Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop

src/store/modules/user.js

@@ -92,11 +92,11 @@ const mutations = {
 }
 
 const actions = {
-  // user login
+  // user login  
   login({ commit }, userInfo) {
     const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ user_name: username.trim(), password: password }).then(response => {
+      login({ username: username.trim(), password: password }).then(response => {
       // login({ username: username.trim(), password: password }).then(response => {
         const { data, msg } = response
         if (msg !== 'ok') {