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

zhaowenyu

2026-03-07 d7fef91a4cbb702988dc820bcde82c166253ceec

 ard-inspection/src/main/java/com/ard/inspection/domain/ArdInspectionGroup.java

@@ -1,6 +1,9 @@
package com.ard.inspection.domain;

import com.ard.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.ArrayList;
@@ -30,6 +33,9 @@

    /** 显示顺序 */
    private Integer orderNum;

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

    /** 父部门名称 */
    private String parentName;
@@ -95,4 +101,23 @@
        this.children = children;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("groupId", getGroupId())
            .append("groupParentId", getGroupParentId())
            .append("ancestors", getAncestors())
            .append("groupName", getGroupName())
            .append("orderNum", getOrderNum())
            .append("delFlag", getDelFlag())
            .toString();
    }
}