From 85d8efdb96a9b4900dbceef524a29690e13b7800 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 28 六月 2024 09:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index af4dc2e..9a72679 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -503,9 +503,9 @@
         loginWarpper.setAppid(UUIDUtil.getRandomCode());
 
         //创建高德猎鹰的终端数据
-//        String tid = gdFalconUtil.createTerminal(phone);
-//        loginWarpper.setServerId(gdFalconUtil.getServerId());
-//        loginWarpper.setTerminalId(tid);
+        String tid = gdFalconUtil.createTerminal(phone);
+        loginWarpper.setServerId(gdFalconUtil.getServerId());
+        loginWarpper.setTerminalId(tid);
         if(driver.getCompanyId()==null){
             loginWarpper.setJumpCode("100000");
         }else{

--
Gitblit v1.7.1