diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php
index 9f5d35d..d4fe0f4 100644
--- a/app/common/controller/UserController.php
+++ b/app/common/controller/UserController.php
@@ -72,57 +72,57 @@ class UserController extends BaseController
         }
     }
 
-    // /**
-    //  * 用户信息
-    //  */
-    // public function getUser(Request $request)
-    // {
-    //     try {
-    //         $uid = $request->user->uid;
-    //         $corp_abbr = $request->basic_data['corp_abbr'];
-    //         $result = (new UserService())->getUser($uid,$corp_abbr);
-    //         return $this->success($result, '获取用户信息');
-    //     } catch (\Throwable $e) {
-    //         return $this->error($e->getMessage());
-    //     }
-    // }
+     /**
+      * 用户信息
+      */
+     public function getUser(Request $request)
+     {
+         try {
+             $uid = $request->user->uid;
+             $corp_abbr = $request->basic_data['corp_abbr'];
+             $result = (new UserService())->getUser($uid,$corp_abbr);
+             return $this->success($result, '获取用户信息');
+         } catch (\Throwable $e) {
+             return $this->error($e->getMessage());
+         }
+     }
 
-    // /**
-    //  * 编辑用户
-    //  */
-    // public function edit(Request $request)
-    // {
-    //     try {
-    //         $uid = $request->user->uid;
-    //         $data = $request->all();
-    //         $result = (new UserService())->edit($uid,$data);
-    //         unset($result['password']);
-    //         unset($result['union_id']);
-    //         unset($result['open_id']);
-    //         unset($result['tenant_key']);
-    //         return $this->success($result, '编辑成功');
-    //     } catch (\Throwable $e) {
-    //         return $this->error($e->getMessage());
-    //     }
-    // }
+     /**
+      * 编辑用户
+      */
+     public function edit(Request $request)
+     {
+         try {
+             $uid = $request->user->uid;
+             $data = $request->all();
+             $result = (new UserService())->edit($uid,$data);
+             unset($result['password']);
+             unset($result['union_id']);
+             unset($result['open_id']);
+             unset($result['tenant_key']);
+             return $this->success($result, '编辑成功');
+         } catch (\Throwable $e) {
+             return $this->error($e->getMessage());
+         }
+     }
 
-    // /**
-    //  * 修改密码
-    //  * @param Request $request
-    //  * @return \support\Response
-    //  * @throws \Random\RandomException
-    //  */
-    // public function savePassword(Request $request)
-    // {
-    //     try {
-    //         $uid = $request->user->uid;
-    //         $data = $request->all();
-    //         $result = (new UserService())->savePassword($uid,$data);;
-    //         return $this->success($result, '编辑成功');
-    //     } catch (\Throwable $e) {
-    //         return $this->error($e->getMessage());
-    //     }
-    // }
+     /**
+      * 修改密码
+      * @param Request $request
+      * @return \support\Response
+      * @throws \Random\RandomException
+      */
+     public function savePassword(Request $request)
+     {
+         try {
+             $uid = $request->user->uid;
+             $data = $request->all();
+             $result = (new UserService())->savePassword($uid,$data);;
+             return $this->success($result, '编辑成功');
+         } catch (\Throwable $e) {
+             return $this->error($e->getMessage());
+         }
+     }
 
 
 }
\ No newline at end of file