Merge remote-tracking branch 'origin/dev_new' into dev_new

gaoluyang

昨天 94b7cc1f950e68c96d6a4510629d903d4706ca27

 src/api/login.js

@@ -1,11 +1,10 @@
import request from '@/utils/request'

// 登录方法
export function loginCheckFactory(username, password, factoryId) {
export function loginCheckFactory(username, password) {
  const data = {
    username,
    password,
    factoryId
  }
  return request({
    url: '/loginCheckFactory',