Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-24 38470a0317c44220f371ef96a4a1b935ac16bdc0

 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"/> GHS
                            <br/>
                            <br/>
                            连续在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                            累计在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                                                 value="${online1.offlineTime}"
                                                 @}else{
                                                 value=""