Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-30 4c50c77f3a5cf63746068d4a703e65792701bc09

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -104,7 +104,8 @@
            MdcEquipment mdcEquipment = new MdcEquipment();
            mdcEquipment.setEquipmentId(entity.getEquipmentCode());
            mdcEquipment.setEquipmentType(entity.getDeviceType());
            mdcEquipment.setEquipmentName(entity.getEquipmentName());
            mdcEquipment.setEquipmentName(entity.getInstallationPosition());
            mdcEquipment.setEquipmentAddress(entity.getEquipmentName());
            mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
        }
        return Result.OK("添加成功！");
@@ -275,7 +276,8 @@
                        MdcEquipment mdcEquipment = new MdcEquipment();
                        mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
                        mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
                        mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
                        mdcEquipment.setEquipmentName(eamEquipment.getInstallationPosition());
                        mdcEquipment.setEquipmentAddress(eamEquipment.getEquipmentName());
                        mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
                    }
                }