Merge branch 'prod' of http://git.raytue.com/GeoFly/GeoFlyApi into prod

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

@@ -313,10 +313,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
         return HttpResultResponse.success();
         return HttpResultResponse.success();
     }
     }
 
 
+    /**
+     *
+     * @param targetUserId user whose password will be reset
+     * @param param        ChangePasswordParam containing newPassword
+     * @return
+     */
     @Override
     @Override
     public HttpResultResponse<Object> resetPassword(String targetUserId, ChangePasswordParam param) {
     public HttpResultResponse<Object> resetPassword(String targetUserId, ChangePasswordParam param) {
-        // Only admins may reset other users' passwords
-        aboveAdminRoleAndThrowError();
 
 
         if (!org.springframework.util.StringUtils.hasText(param.getNewPassword())) {
         if (!org.springframework.util.StringUtils.hasText(param.getNewPassword())) {
             return HttpResultResponse.error("New password must not be empty");
             return HttpResultResponse.error("New password must not be empty");