fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 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;
    }