From 912b4dab5f847ab1108b18df1b5e06e85c71881e Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:15 +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