From 37e8e06c8d13146e62ef08d018d86443b9f42f00 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 二月 2025 14:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/ResourceContent.js | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index d91a310..43069ae 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -13,8 +13,6 @@
import menu from './system/menu'
import user from './system/user';
import operationRecord from './system/operationRecord';
-import customer from './customer';
-import shipper from './basicInfo/shipper';
import matnr from './basicInfo/matnr';
import matnrGroup from './basicInfo/matnrGroup';
import warehouse from './basicInfo/warehouse';
@@ -22,9 +20,10 @@
import loc from './loc';
import container from './container';
import contract from './contract';
-import stockItem from './stockItem';
-import stock from './stock';
import qlyInspect from './qlyInspect';
+import dictType from './dictType';
+import dictData from './dictData';
+import companys from './basicInfo/companys';
const ResourceContent = (node) => {
@@ -47,10 +46,6 @@
return user;
case 'operationRecord':
return operationRecord;
- case 'customer':
- return customer;
- case 'shipper':
- return shipper;
case 'matnr':
return matnr;
case 'matnrGroup':
@@ -65,12 +60,14 @@
return container;
case 'contract':
return contract;
- case 'stockItem':
- return stockItem;
- case 'stock':
- return stock;
case 'qlyInspect':
return qlyInspect;
+ case 'dictType':
+ return dictType;
+ case 'dictData':
+ return dictData;
+ case 'companys':
+ return companys;
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1