Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -46,6 +46,11 @@
    /** 角色状态（0正常 1停用） */
    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
    private String status;
    /**
     * 门店id
     */
    @TableField("shop_id")
    private Integer shopId;

    /** 删除标志（0代表存在 2代表删除） */
    @TableField("del_flag")
@@ -214,6 +219,14 @@
        this.number = number;
    }
    
    public Integer getShopId() {
        return shopId;
    }
    
    public void setShopId(Integer shopId) {
        this.shopId = shopId;
    }
    
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)