From 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 15:20:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
index 1c12ac6..fbcb784 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -56,8 +56,8 @@
                                          name="zc7" id="num5" class="form-control newWidth"/>&nbsp;GHS
                             <br/>
                             <br/>
-                            连续在线&nbsp;<input type="text" @if(isNotEmpty(item.offline)){
-                                                 value="${item.offline}"
+                            连续在线&nbsp;<input type="text" @if(isNotEmpty(item.offlineTime)){
+                                                 value="${item.offlineTime}"
                                                  @}else{
                                                  value=""
                                                  @}

--
Gitblit v1.7.1