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

luodangjia

2024-07-23 9af336a5be2483d67b5dbbf02d87e1e54185014f

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

@@ -340,7 +340,7 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">预约订单取消规则：</label>
                        <div class="col-sm-10">
                            订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                            预约订单在预约时间前&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                           @if(isNotEmpty(orderAcceptanceTime1)){
                                                           value="${orderAcceptanceTime1}"
                                                           @}else{