Merge branch '0813-v2.7.0' into test

eaa1e8f4 · hujun · 437775cb · 8805d04e · eaa1e8f4
Commit eaa1e8f4 authored Aug 17, 2018 by hujun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Finance.php application/index/controller/Finance.php +1 -1

No files found.
--- a/application/index/controller/Finance.php
+++ b/application/index/controller/Finance.php
@@ -1221,7 +1221,7 @@ class Finance extends Basic
        $m_bargain = new OBargainModel();
        $update_data['status'] = 10;
        $update_data['audit_level'] = 0;
-        $m_bargain->updateBargainById($this->params['bargain_id'], [ 'status' => 10 ]);
+        $m_bargain->updateBargainById($this->params['bargain_id'], $update_data);
        $msg = '';
        if ($data > 0) {
            $code = 200;