Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

# Conflicts: # pom.xml # yudao-dependencies/pom.xml
2024-10-01 16:11:13 +08:00
parent eae97e1b33 0acda7e874
commit 5e9bdcb21f
6 changed files with 39 additions and 35 deletions
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
@@ -76,5 +76,4 @@ public class AppMemberUserController {
        return success(true);
    }

-}
-
+}