From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 2dceb2e..186be08 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -23,7 +23,7 @@
/**
* 用户ID
*/
- private Long userId;
+ private String userId;
/**
* 部门ID
@@ -86,7 +86,7 @@
this.permissions = permissions;
}
- public LoginUserApplet(Long userId, Long deptId, TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(String userId, Long deptId, TTenantResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -94,12 +94,12 @@
this.permissions = permissions;
}
- public Long getUserId()
+ public String getUserId()
{
return userId;
}
- public void setUserId(Long userId)
+ public void setUserId(String userId)
{
this.userId = userId;
}
--
Gitblit v1.7.1