From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx b/HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx
index 57e5ac0..7e8b462 100644
--- a/HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx
+++ b/HIAWms/web/src/widgets/HIAWms/Views/HIAWms.tsx
@@ -46,13 +46,13 @@
for (const i in entityNames) {
const name = entityNames[i]
const module = await import(`./Pages/${name}/${name}.tsx`)
- const WmsPlaces = markRaw(module.default)
+ const WmsMaterial = markRaw(module.default)
const foundLabel =
nameToLabelMap.find((item) => item.name === name)?.label || name
tabData.value.push({
label: foundLabel,
name,
- component: WmsPlaces,
+ component: WmsMaterial,
})
}
}
--
Gitblit v1.9.3