Merge branch 'feature/user0812' into develop_bm

# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php

app/admin/controller/UserController.php

@@ -19,6 +19,42 @@ class UserController extends BaseController
         $this->service = new UserService();
     }
 
+
+    /**
+     * 修改密码
+     * @param Request $request
+     * @return \support\Response
+     * @throws \Random\RandomException
+     */
+    public function savePassword(Request $request)
+    {
+        try {
+            $data = $this->validate($this->service->getValidator(), $request->post(), 'password');
+            $data = $request->all();
+            $result = $this->service->savePassword($request,$data);;
+            return $this->success($result, '编辑成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 更新
+     *
+     * @param Request $request 请求对象
+     * @return mixed 返回更新成功的数据或信息
+     */
+    public function edit(Request $request)
+    {
+        try {
+            $data = $this->validate($this->service->getValidator(), $request->post(), 'update');
+            $res = $this->service->serviceUpdate($request, $data);
+            return $this->success([], '更新成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
     /**
      * 列表页数据格式化
      *