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

# Conflicts:
#	application/views/perm/staff.php

@@ -119,7 +119,6 @@
         ]
     });
 
-
     $.fn.dataTableExt.afnFiltering.push(
         function (oSettings, aData, iDataIndex) {
             var min = document.getElementById('min').value;
@@ -219,7 +218,6 @@
         });
     }
 
-
     function unfreeze(id) {
         layer.confirm('您确定要解冻这个员工账号吗?', {
             btn: ['确认','取消'],
@@ -228,8 +226,7 @@
         }, function(){
             $.ajax({
                 type: 'put',
-//                url: apiBaseUrl + 'manage/financial/confirm/' + id + '?realRepaymentDate=' + Date.now(),
-                url: apiBaseUrl +'/system/user/unfreeze/'+data['id'],
+                url: apiBaseUrl + 'manage/financial/confirm/' + id + '?realRepaymentDate=' + Date.now(),
                 cache: false,
                 dataType: 'json',
                 contentType: "application/json; charset=UTF-8",