Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/controller/api/v1/PublicController.php

@@ -66,7 +66,7 @@ class PublicController extends BaseController
 
     public function test()
     {
-        $this->dealOrderIntegral(StoreOrder::where('id', 727)->find());
+//        $this->dealOrderIntegral(StoreOrder::where('id', 727)->find());
     }
 
     public function dealOrderIntegral($order)