Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

Pu Zhibing

2025-07-30 d04bcbfa85b97e4444bac2a66bbee611d05f0f0e

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html

@@ -31,7 +31,7 @@
                                <#NameCon id="carLicensePlate" name="车牌号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="driverName" name="关联司机" />
                                <#NameCon id="driverName" name="司机" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="companyName" name="所属分公司" />
@@ -59,13 +59,14 @@
                            @}
                            @if(shiro.hasPermission("/tCar/inCar")){
                                <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TCar.uploadCarModel()" space="true"/>
                                <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
                                <#button btnCss="danger" name="导入车辆" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCar/outCar")){
                                <#button name="导出" icon="fa-remove" clickFun="TCar.outCar()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCar/carInsurance")){
                            <#button name="车辆保险" icon="fa-remove" clickFun="TCar.carInsurance()" space="true"/>
                            <#button name="授权司机" icon="fa-remove" clickFun="TCar.openTCarDetail1()" space="true"/>
                            @}
                        </div>
                        <!--<div style="width: 100%;overflow-y: auto">