Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Resign.php

@@ -759,7 +759,7 @@ class Resign extends BaseController
             "send_num"=>"0",
             "wsend_num"=>$info['good_num'],
             "remark"=>"",
-            "status"=>0,
+            "status"=>1,
             "lasttime"=>date("Y-m-d H:i:s"),
             "is_del"=>0,
             "order_type"=>1,

app/admin/controller/Sale.php

@@ -405,7 +405,7 @@ class Sale extends Base
             "send_num"=>"0",
             "wsend_num"=>$data['good_num'],
             "remark"=>"",
-            "status"=>0,
+            "status"=>1,
             "lasttime"=>date("Y-m-d H:i:s"),
             "is_del"=>0,
             "order_type"=>$data['order_type'],