Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-01 593d785f10bc554cdc8eddf23e5e324c0258adbb

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java

@@ -3,7 +3,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;

import java.io.Serializable;
import java.util.ArrayList;
@@ -47,7 +47,7 @@
    public RepairDepartIdModel convert(EamBaseRepairDepartTreeModel treeModel) {
        this.key = treeModel.getId();
        this.value = treeModel.getId();
        this.title = treeModel.getMaintainName();
        this.title = treeModel.getDepartName();
        return this;
    }

@@ -59,7 +59,7 @@
    public RepairDepartIdModel convertByUserMaintainDepart(EamBaseRepairDepart mdcMaintainDepart) {
        this.key = mdcMaintainDepart.getId();
        this.value = mdcMaintainDepart.getId();
        this.title = mdcMaintainDepart.getMaintainName();
        this.title = mdcMaintainDepart.getDepartName();
        return this;
    }
}