From 1e643b7beb7ae711803b47285ca0aa7f2c1eb926 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 二月 2025 10:13:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/page/ResourceContent.js |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index c25047f..f2e8798 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -4,20 +4,21 @@
     ShowGuesser,
 } from "react-admin";
 
-import host from "./host";
-import config from './config';
-import tenant from './tenant';
-import role from './role';
-import userLogin from './userLogin';
-import dept from "./dept";
-import menu from './menu'
-import user from './user';
-import operationRecord from './operationRecord';
+import host from "./system/host";
+import config from './system/config';
+import tenant from './system/tenant';
+import role from './system/role';
+import userLogin from './system/userLogin';
+import dept from "./system/dept";
+import menu from './system/menu'
+import user from './system/user';
+import operationRecord from './system/operationRecord';
 import customer from './customer';
 import shipper from './shipper';
 import matnr from './matnr';
 import matnrGroup from './matnrGroup';
-
+import warehouse from './warehouse';
+import warehouseAreas from './warehouseAreas';
 
 
 const ResourceContent = (node) => {
@@ -48,6 +49,10 @@
             return matnr;
         case 'matnrGroup':
             return matnrGroup;
+        case 'warehouse':
+            return warehouse;
+        case 'warehouseAreas':
+            return warehouseAreas;
         default:
             return {
                 list: ListGuesser,

--
Gitblit v1.9.1