Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java

@@ -99,7 +99,7 @@ public class AppAuthController {
      */
     @PostMapping("/logout")
     public R<Void> logout() {
-//        loginService.logout();
+        loginService.logout();
         return R.ok("退出成功");
     }