From 38470a0317c44220f371ef96a4a1b935ac16bdc0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 24 七月 2024 13:49:37 +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 |    2 +-
 1 files changed, 1 insertions(+), 1 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 8f1cfb6..01d352e 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,7 +56,7 @@
                                          name="zc7" id="num5" class="form-control newWidth"/>&nbsp;GHS
                             <br/>
                             <br/>
-                            连续在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
+                            累计在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                                                  value="${online1.offlineTime}"
                                                  @}else{
                                                  value=""

--
Gitblit v1.7.1