Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49

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

@@ -1,14 +1,13 @@
package com.ruoyi.system.api.domain;

import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import com.ruoyi.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.web.domain.BaseEntity;

import javax.validation.constraints.Email;
import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.List;

/**
 * 部门表 sys_dept
@@ -48,6 +47,10 @@

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;
    /**
     * 门店id
     */
    private Integer shopId;

    /** 父部门名称 */
    private String parentName;
@@ -178,7 +181,15 @@
    {
        this.children = children;
    }

    
    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)