Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/youzan/controller/Index.php

@@ -122,7 +122,7 @@ class Index extends Base
     public function getYzOrderList()
     {
 
-        $param = $this->request->filter('trim')->only(['oid' => '', 'plat_code' => '', 'orderCode' => '', 'skuCode' => '', 'platform_name' => '', 'status' => '', 'addtime_start' => '', 'addtime_end' => '', 'page' => 1, 'size' => 15], 'post');
+        $param = $this->request->filter('trim')->only(['tid' => '','oid' => '', 'plat_code' => '', 'orderCode' => '', 'skuCode' => '', 'platform_name' => '', 'status' => '', 'addtime_start' => '', 'addtime_end' => '', 'page' => 1, 'size' => 15], 'post');
 
         return Order::getYzOrderList($param);