Merge branch 'dev-wks' into dev

src/http/moudules/login.js

@@ -16,7 +16,7 @@ export const login = data => {
 // 登录2
 export const login2 = data => {
   return axios({
-    url: '/login2',
+    url: '/system/login',
     method: 'post',
     data
   })