From 412842e95fcd748eddf4fbbfee018b5755f0f1b9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 10 四月 2025 14:21:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/ResourceContent.js | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 8214420..2ead1d2 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -42,6 +42,10 @@
import deviceSite from './basicInfo//deviceSite';
import waitPakin from './waitPakin';
import waitPakinItem from './waitPakinItem';
+import waitPakinLog from './waitPakinLog';
+import asnOrderLog from './asnOrderLog';
+import task from './task';
+import taskLog from './taskLog';
const ResourceContent = (node) => {
switch (node.component) {
@@ -99,6 +103,8 @@
return asnOrder;
case 'asnOrderItem':
return asnOrderItem;
+ case 'asnOrderLog':
+ return asnOrderLog;
case 'purchaseItem':
return purchaseItem;
case 'purchase':
@@ -121,8 +127,12 @@
return waitPakin;
case 'waitPakinItem':
return waitPakinItem;
-
-
+ case 'waitPakinLog':
+ return waitPakinLog;
+ case 'task':
+ return task;
+ case 'taskLog':
+ return taskLog;
default:
return {
--
Gitblit v1.9.1