fix: 合并冲突解决

src/main/java/com/youlai/system/controller/AuthController.java

@@ -25,8 +25,8 @@ public class AuthController {
     @Operation(summary = "登录")
     @PostMapping("/login")
     public Result<LoginResult> login(
-            @Parameter(name = "用户名",example = "admin") @RequestParam String username,
-            @Parameter(name = "密码") @RequestParam String password
+            @Parameter( description= "用户名",example = "admin") @RequestParam String username,
+            @Parameter(description = "密码") @RequestParam String password
     ) {
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
                 username.toLowerCase().trim(),

src/main/java/com/youlai/system/pojo/dto/LoginResult.java

@@ -1,16 +1,21 @@
 package com.youlai.system.pojo.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 
+@Schema(description ="登录响应对象")
 @Data
 @Builder
 public class LoginResult {
 
+    @Schema(description = "访问token")
     private String accessToken;
 
+    @Schema(description = "刷新token")
     private String refreshToken;
 
+    @Schema(description = "过期时间(单位：毫秒)")
     private Long expires;
 
 }

src/main/java/com/youlai/system/pojo/vo/ResourceVO.java

@@ -21,5 +21,4 @@ public class ResourceVO {
     private List<ResourceVO> children;
 
 
-
 }