解决冲突

application/admin/controller/trade/MoneyOut.php

@@ -94,6 +94,7 @@ class MoneyOut extends Backend
             if($status == $this->model::Reject){
                 (new MoneyLog())->change($row->user_id, $amount, MoneyLog::Reject, '', '驳回');
             }
+
             $result = $row->allowField(true)->save(['status'=>$status]);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {