From c9eecfa9c5b02669cb100a5442f8fced55a2b78b Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 26 Feb 2020 16:10:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E6=98=93=E5=AE=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 0858173e2..ac2b17e4c 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -1818,6 +1818,7 @@ function all_pay_way_other($type=false)
     /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
  */
     $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
+    $pay_way[17]=array('key'=>17,'value'=>"易宝支付");
     return $pay_way;
 }
 

From ba96083bb52afa7b94042490ab679a2d3af1c3c9 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Wed, 26 Feb 2020 16:15:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/TestOrder/addOrder.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/TestOrder/addOrder.html b/Application/Admin/View/TestOrder/addOrder.html
index d1c160c14..520d94327 100644
--- a/Application/Admin/View/TestOrder/addOrder.html
+++ b/Application/Admin/View/TestOrder/addOrder.html
@@ -166,14 +166,21 @@
 
 <script>
     $(function(){
-        $('#datetimepicker').datetimepicker({
+        /*$('#datetimepicker').datetimepicker({
             format: 'yyyy-mm-dd hh:ii:ss',
             language: "zh-CN",
             minView: 2,
             endDate:new Date(),
             autoclose: true,
             pickerPosition: 'bottom-left'
-        })
+        })*/
+        $('#datetimepicker').datetimepicker({
+            language:"zh-CN",
+            hour: 13,
+            minute: 15,
+            autoclose: true
+        });
+
         EVENT.changeCompany();
         EVENT.createStatement();
         $("#first_partner_id").change();//默认甲方只能是我们公司