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

Application/Admin/Controller/UserActionLogController.class.php

@@ -65,7 +65,15 @@ class UserActionLogController extends AdminController
                 $data[$key]['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 4) {
                 $data[$key]['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
-            }
+            } else if ($value['type'] == 0) {
+               $data[$key]['action'] = '修改密码';
+           } else if ($value['type'] == 1) {
+               $data[$key]['action'] = '修改/绑定手机号';
+           } else if ($value['type'] == 2) {
+               $data[$key]['action'] = '修改身份信息';
+           } else if ($value['type'] == 5) {
+               $data[$key]['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+           }
        }
 //       die();