Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/admin/controller/order/StoreOrder.php

@@ -123,7 +123,7 @@ class StoreOrder extends AuthController
             ['page', 1],
             ['limit', 20],
         ]);
-        return Json::successlayui(StoreExchangeOrder::OrderList($where));
+        return Json::successlayui(StoreExchangeOrder::getList($where));
     }
 
     public function order_print($id = '')