Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/SettlementController.class.php

@@ -435,7 +435,7 @@ class SettlementController extends ThinkController
     } else if ($arr_index + 1 == sizeof($info['audit_users']) && $info['status'] != 3) {
         return $this->error('该结算单已经审核完毕', true, true);
     }
-    $is_last = ($info['setp'] + 1 >= sizeof($info['audit_users']));
+    $is_last = ($info['step'] + 1 >= sizeof($info['audit_users']));
     $update['remark'] = $remark;
     $update['status'] = $audit_type == 1 ?  ($is_last ? 1 : 3) : 2;
     $update['step'] = ($audit_type == 1 && !$is_last) ? $info['step'] + 1 : $info['step'];