From c0e9ac907ee658802f68eb4e770942e34e87cfd0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 25 七月 2025 16:43:50 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html
index af6e266..7e450ad 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html
@@ -40,9 +40,9 @@
<div class="col-sm-10 " style="width: 630px">
<select data-style="btn-primary" title="请选择服务类型" class="selectpicker form-control "
id="orderType" multiple>
-<!-- <option value="1">快车</option>-->
+ <option value="1">快车</option>
<option value="2">出租车</option>
- <!-- <option value="3">城际</option>-->
+ <option value="3">城际</option>
<!-- <option value="4">同城-小件物流</option>-->
<!-- <option value="5">跨城-小件物流</option>-->
</select>
--
Gitblit v1.7.1