Merge remote-tracking branch 'origin/master'

cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java

@@ -29,7 +29,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 //        adminConfig.setTimeout(1000);
         adminConfig.setTokenStyle("simple-uuid");
         adminConfig.setIsConcurrent(true);
-        adminConfig.setIsShare(true);
+        adminConfig.setIsShare(false);
         MyStpLogic.ADMIN_LOGIC.setConfig(adminConfig);
 
         // 小程序配置

cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java

@@ -65,10 +65,13 @@ public class MyStpLogic {
             throw new ApiNotPrintException("管理端登录必须传递店铺id");
         }
         SaSession session = logic.getSession().set("userId", id).set("isAdmin", isAdmin).set("isManager", loginType.equals(LoginType.MANAGER))
-                .set("loginType", loginType).set("account", account).set("shopName", shopName);
+                .set("loginType", loginType).set("account", account);
         if (shopId != null) {
             session.set("shopId", shopId);
         }
+        if (shopName != null) {
+            session.set("shopName", shopName);
+        }
     }
 
     public void reLogin(long id) {