Merge branch 'feature/c2c' into develop

99ed382c · shajiaiming · 23627068 · a7dd5665 · 99ed382c
Commit 99ed382c authored Oct 30, 2019 by shajiaiming
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderController.php api/controllers/OrderController.php +1 -1

No files found.
--- a/api/controllers/OrderController.php
+++ b/api/controllers/OrderController.php
@@ -168,7 +168,7 @@ class OrderController extends BaseController
        if (false == $latest_model) {
            $msg = '订单不存在';
            $code = -1;
-            $data = null;
+            $step = 0;
            goto doEnd;
        }