From 04b442ee39fc151d43871b8af57d61c15df9d40b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 09:55:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/ResourceContent.js | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 4820cef..88b9a97 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -68,6 +68,7 @@
import preparation from "./orders/preparation";
import menuPda from './menuPda';
import taskPathTemplate from './taskPathTemplate';
+import taskPathTemplateMerge from './taskPathTemplateMerge';
const ResourceContent = (node) => {
switch (node.component) {
@@ -199,6 +200,8 @@
return menuPda;
case 'taskPathTemplate':
return taskPathTemplate;
+ case 'taskPathTemplateMerge':
+ return taskPathTemplateMerge;
// case "locItem":
// return locItem;
default:
--
Gitblit v1.9.1