From f18769abd5315cd013b97883ce2e4bc99dc362ef Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 3 Aug 2024 15:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=9B=9E=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/config/security/rest/AuthorizationController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
index c321ea7f..250da238 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
@@ -150,7 +150,7 @@ public class AuthorizationController {
             put("user", jwtUserDto);
             if (byAccount != null) {
                 put("shopId", byAccount.getId());
-                put("loginType", org.apache.commons.lang3.StringUtils.isNotBlank(authUser.getLoginType())?"merchant":authUser.getLoginType());
+                put("loginType", org.apache.commons.lang3.StringUtils.isNotBlank(authUser.getLoginType())?authUser.getLoginType():"merchant");
                 put("shopName", byAccount.getShopName());
                 put("logo", byAccount.getLogo());
             }