From f00f83d2b2a868e518b78c76d3e11bc01aabffa7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'front' of http://47.97.1.152:5880/r/wms-master into front

---
 rsf-admin/src/page/ResourceContent.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index b5b46b3..b17dc51 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -27,6 +27,7 @@
 import companys from './basicInfo/companys';
 import locType from './basicInfo/locType';
 import locArea from './basicInfo//locArea';
+import locAreaMatRela from './basicInfo/locAreaMatRela';
 import serialRuleItem from './system/serialRuleItem';
 import serialRule from './system/serialRule';
 import whMat from './basicInfo/whMat';
@@ -106,6 +107,9 @@
             return locType;
         case 'locArea':
             return locArea;
+        case 'locAreaMatRela':
+            return locAreaMatRela;
+
 
         default:
             return {

--
Gitblit v1.9.1