Merge remote-tracking branch 'origin/master'

Backend/sample/src/main/java/com/dji/sample/manage/controller/UserController.java

@@ -87,9 +87,9 @@ public class UserController {
     }
 
     @GetMapping("/getPwd")
-    public HttpResultResponse getPwd(@NotNull String username) {
-        log.info("==========getPwd接口调用  username:" + username );
-        return userService.getPwd(username);
+    public HttpResultResponse getPwd(@NotNull String userId) {
+        log.info("==========getPwd接口调用  username:" + userId );
+        return userService.getPwd(userId);
     }
 
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/IUserService.java

@@ -72,8 +72,8 @@ public interface IUserService {
 
     /**
      * 获取密码
-     * @param username
+     * @param userId
      * @return
      */
-    HttpResultResponse getPwd(String username);
+    HttpResultResponse getPwd(String userId);
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -494,8 +494,8 @@ public class UserServiceImpl implements IUserService {
     }
 
     @Override
-    public HttpResultResponse getPwd(String username) {
-        UserEntity userEntity = getUserByUsername(username);
+    public HttpResultResponse getPwd(String userId) {
+        UserEntity userEntity = mapper.selectById(userId);
         if (userEntity == null) {
             return new HttpResultResponse()
                     .setCode(HttpStatus.BAD_REQUEST.value())