From a64d342c0371eadebc29dae2a60a9525ce95e222 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 09 四月 2025 17:04:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/ResourceContent.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 04eb0c5..3b244fe 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -47,7 +47,9 @@
import asnOrderLog from './asnOrderLog';
import asnOrderItemLog from './asnOrderItemLog';
import task from './task';
-import taskItem from './taskItem';
+// import taskItem from './taskItem';
+import taskLog from './taskLog';
+import taskItemLog from './taskItemLog';
const ResourceContent = (node) => {
@@ -138,9 +140,12 @@
return waitPakinItemLog;
case 'task':
return task;
- case 'taskItem':
- return taskItem;
-
+ // case 'taskItem':
+ // return taskItem;
+ case 'taskLog':
+ return taskLog;
+ case 'taskItemLog':
+ return taskItemLog;
default:
return {
--
Gitblit v1.9.1