Merge branch 'plm' of wugg/stock into master

app/admin/controller/Resign.php

@@ -481,8 +481,8 @@ class Resign extends BaseController
                 $temp=$info['status'];
                 $info['status']=2;
                 $info['addtime']=date("Y-m-d H:i:s");
-                $ood=Db::name('purchease')->save($info,true);
-                if($ood>0){
+                $ood=Db::name('purchease')->save($info);
+                if($ood){
                     $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'], "order_status"=>$info['status']];
                     ProcessOrder::AddProcess($this->post['token'],$order);
                     $ste = ["order_code"=>$info['bk_code'],"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];