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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html

@@ -18,7 +18,7 @@
                                    <option value="0">通用券</option>
                                    <option value="1">专车券</option>
                                    <!--<option value="2">出租车券</option>-->
                                    <option value="3">直通车券</option>
                                    <option value="3">跨城券</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">