Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/oppmg into dev

# Conflicts:
#	models/user_company.go
#	services/auth/auth.go

@@ -231,12 +231,7 @@ func LoginAuthByUCenter(account, password string) (protocol.LoginAuthToken, erro
 		companyid     int64
 		userdata      *models.User
 	)
-<<<<<<< HEAD
-
-	_, err = models.GetUserByPhone(account)
-=======
 	userdata, err = models.GetUserByPhone(account)
->>>>>>> 626a6b6d8e73bd83579be13a797ab6c1fce8d3d8
 	if err != nil {
 		log.Debug("GetUserByPhone(%s) err:%s", account, err)
 		return logintoken, protocol.NewErrWithMessage("10021")