From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
index 03cd9f1..1bbbdc6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
@@ -290,7 +290,7 @@
for(var i in data1){
var driver = data1[i].driver;
var driverId = driver.id;
- d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
+ d += '<li class="list-group-item" id="' + driverId + '">' + driver.firstName + " " + driver.lastName + '-' + driver.phone + '</li>';
if('' != data1[i].lon){
const image = {
url: "/static/icon_car@2x.png",
@@ -319,7 +319,7 @@
for(var i in data2){
var driver = data2[i].driver;
var driverId = driver.id;
- d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
+ d += '<li class="list-group-item" id="' + driverId + '">' + driver.firstName + " " + driver.lastName + '-' + driver.phone + '</li>';
if('' != data2[i].lon){
const image = {
url: "/static/car.png",
--
Gitblit v1.7.1