fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -1,5 +1,6 @@
package com.ruoyi.common.core.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.domain.BaseModel;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -74,6 +75,11 @@
     * 岗位类型 1=经理 2=负责人 3=专员
     */
    private Integer postType;
    /**
     * 角色人数
     */
    @TableField(exist = false)
    private Integer userCount;

    public Integer getPostType() {
        return postType;