Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -153,14 +153,14 @@
                                                <th style="width: 250px;">充值金额</th>
                                                <th style="width: 250px;">有效天数</th>
                                                <th style="width: 300px;">最高金额</th>
                                                <th style="width: 300px;">通用券金额</th>
                                                <th style="width: 300px;">通用券数量</th>
                                                <th style="width: 300px;">专车券金额</th>
                                                <th style="width: 300px;">专车券数量</th>
                                                <th style="width: 300px;">通用优惠券金额</th>
                                                <th style="width: 300px;">通用优惠卷数量</th>
                                                <th style="width: 300px;">打车优惠券金额</th>
                                                <th style="width: 300px;">打车优惠券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <!--<th style="width: 300px;">城际金额</th>-->
                                                <!--<th style="width: 300px;">城际券数量</th>-->
                                                <th style="width: 300px;">包裹优惠卷金额</th>
                                                <th style="width: 300px;">包裹优惠券数量</th>
                                                <th style="width: 100px;">操作</th>
                                            </tr>
                                            </thead>