Merge branches 'master' and 'master' of http://120.76.84.145:10101/gitblit/...

liujie

2025-07-25 c0e9ac907ee658802f68eb4e770942e34e87cfd0

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

@@ -59,7 +59,6 @@
                        </div>
                        <div style="float: left;width: 1200px;margin-left: 50px;">
                            <div class="pushOrderSettings">
                               <!--
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">快车推单：</label>
                                    <div class="col-sm-10">
@@ -133,7 +132,6 @@
                                        <br/>
                                    </div>
                                </div>
                               -->
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">出租车推单：</label>
                                    <div class="col-sm-10">
@@ -238,7 +236,6 @@
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">取消设置：</label>
                                    <div class="col-sm-10">
                                       <!--
                                        快车订单取消规则：快车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(ptCancel1)){
                                                                       value="${ptCancel1.minuteNum}"
@@ -254,7 +251,6 @@
                                                           @}
                                                           name="ptCancel2" id="ptCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                                        <br/>
                                        -->
                                        <br/>
                                        出租车订单取消规则：出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                         @if(isNotEmpty(ptCancel2)){
@@ -271,7 +267,6 @@
                                                           @}
                                                           name="ptCancel4" id="ptCancel4" class="form-control newWidth" />&nbsp;元取消费用；
                                        <br/>
                                       <!--
                                        <br/>
                                        跨城出行取消规则：跨城订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(ptCancel3)){
@@ -288,7 +283,6 @@
                                                           @}
                                                           name="ptCancel6" id="ptCancel6" class="form-control newWidth" />&nbsp;元取消费用；
                                        <br/>
                                        -->
                                    </div>
                                </div>

@@ -302,7 +296,6 @@
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">预约单取消设置：</label>
                                    <div class="col-sm-10">
                                       <!--
                                        快车订单取消规则：快车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(yyCancel1)){
                                                                       value="${yyCancel1.minuteNum}"
@@ -318,7 +311,6 @@
                                                           @}
                                                           name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                                        <br/>
                                        -->
                                        <br/>
                                        出租车订单取消规则：出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                         @if(isNotEmpty(yyCancel2)){
@@ -441,7 +433,6 @@
                                                      @}
                                                      name="one" id="one" class="form-control newWidth" />&nbsp;元；<br/>
                                </div>
                               <!--
                                <div class="col-sm-3">
                                    <label class="col-sm-5 control-label">快车改派：</label>
                                    <div class="col-sm-7">
@@ -456,7 +447,6 @@
                                        </div>
                                    </div>
                                </div>
                                -->
                                <div class="col-sm-3">
                                    <label class="col-sm-5 control-label">出租车改派：</label>
                                    <div class="col-sm-7">