Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-23 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f

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

@@ -73,6 +73,24 @@
                                    <option value="12">取消待支付</option>
                                </#SelectCon>
                            </div>
                                    <div class="col-sm-3">
                                        <#SelectCon id="abnormal" name="是否异常订单" >
                                        <option value="">全部</option>
                                        <option value="1">否</option>
                                        <option value="2">是</option>
                                    </#SelectCon>
                                </div>

                                <div class="col-sm-3">
                                    <#SelectCon id="promotion" name="是否推广订单" >
                                    <option value="">全部</option>
                                    <option value="1">否</option>
                                    <option value="2">是</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="promotionUser" name="推广员姓名" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="TOrderCrossCity.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TOrderCrossCity.resetSearch()" space="true"/>
@@ -91,6 +109,8 @@
                            @if(shiro.hasPermission("/tOrderCrossCity/delete")){
                                <#button name="删除记录" icon="fa-remove" clickFun="TOrderCrossCity.delete()" space="true"/>
                            @}

                            <#button name="导出Excel" icon="fa-remove" clickFun="TOrderCrossCity.exportExcel()()" space="true"/>
                        </div>
                        <#table id="TOrderCrossCityTable"/>
                    </div>