From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index 66223bd..31a3689 100644
--- a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -25,7 +25,7 @@
// @Test
// public void test() {
//
-// Driver driver = driverService.selectById(driverId);
+// Driver driver = driverService.selectById(14);
// TokenRequest tokenRequest = new TokenRequest();
// tokenRequest.setAppUserId(driver.getEmpId().toString());
// tokenRequest.setUserName(driver.getName());
@@ -34,15 +34,14 @@
// TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
// tradeTerminalInfo.setIp("127.0.0.1");
// tradeTerminalInfo.setTerminal("1");
-// tradeTerminalInfo.setMac("");
+// tradeTerminalInfo.setMac("111-111-111-111");
// tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
-// tokenRequest.setType(type);
-// String token = null;
+// tokenRequest.setType("04");
// try {
-// token = TokenUtil.getToken(tokenRequest);
+// String token = TokenUtil.getToken(tokenRequest);
+// System.err.println(token);
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
-// System.err.println(token);
// }
//}
--
Gitblit v1.7.1