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

application/admin/controller/unishop/Order.php

@@ -27,7 +27,7 @@ class Order extends Backend
      */
     protected $relationSearch = true;
 
-    protected $noNeedLogin=["export","finish","doRefund"];
+    protected $noNeedLogin=["export","finish","doRefund","carry"];
 
     /**
      * Order模型对象