Merge branch 'feature-task'

wlzboy

2025-10-26 2c86a8bd60deed0dd0e044bad6fb83f75d19a332

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

@@ -52,6 +52,15 @@
    /** 父部门名称 */
    private String parentName;
    
    /** SQL Server中的部门ID */
    private Integer departmentId;
    
    /** 服务单编码(对应旧系统OrderClass vType=1) */
    private String serviceOrderClass;
    
    /** 调度单编码(对应旧系统OrderClass vType=2) */
    private String dispatchOrderClass;
    
    /** 子部门 */
    private List<SysDept> children = new ArrayList<SysDept>();

@@ -181,6 +190,36 @@
        this.children = children;
    }

    public Integer getDepartmentId()
    {
        return departmentId;
    }

    public void setDepartmentId(Integer departmentId)
    {
        this.departmentId = departmentId;
    }

    public String getServiceOrderClass()
    {
        return serviceOrderClass;
    }

    public void setServiceOrderClass(String serviceOrderClass)
    {
        this.serviceOrderClass = serviceOrderClass;
    }

    public String getDispatchOrderClass()
    {
        return dispatchOrderClass;
    }

    public void setDispatchOrderClass(String dispatchOrderClass)
    {
        this.dispatchOrderClass = dispatchOrderClass;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -198,6 +237,7 @@
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("departmentId", getDepartmentId())
            .toString();
    }
}