Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

 cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html

@@ -80,12 +80,12 @@
        font-size: 14px;
    }
</style>
<input hidden id="language" value="${language}">

@if(language==1){
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>活动时间：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -167,7 +167,7 @@
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>Activity time：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -249,7 +249,7 @@
<div class="row" style="margin-left: 2%;">
    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <input hidden id="language" value="${language}">

        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>Waktu aktivitas：<input type="text" id="startTime"  name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>