Merge remote-tracking branch 'origin/dev' into dev

xlsea

2024-12-16 4d566071db7853c66805a1ffac2fd9c93a6aac8a

 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java

@@ -1,8 +1,9 @@
package org.dromara.common.core.domain.model;

import org.dromara.common.core.domain.dto.RoleDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.dromara.common.core.domain.dto.PostDTO;
import org.dromara.common.core.domain.dto.RoleDTO;

import java.io.Serial;
import java.io.Serializable;
@@ -112,6 +113,11 @@
    private List<RoleDTO> roles;

    /**
     * 岗位对象
     */
    private List<PostDTO> posts;

    /**
     * 数据权限 当前角色ID
     */
    private Long roleId;