fix: 合并冲突解决

2023-03-03 00:55:59 +08:00
parent 5a9788fedc 6455d745d0
commit 72d1d8a7c4
4 changed files with 8 additions and 3 deletions
--- a/src/main/java/com/youlai/system/controller/AuthController.java
+++ b/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(),