From b2bd54b277f12d532e5c87e02e3e97d087a52fee Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 三月 2025 16:47:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/page/ResourceContent.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 4fe2594..d8753d0 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';
@@ -25,6 +23,10 @@
import qlyInspect from './qlyInspect';
import dictType from './dictType';
import dictData from './dictData';
+import companys from './basicInfo/companys';
+import serialRuleItem from './serialRuleItem';
+import serialRule from './serialRule';
+import whMat from './basicInfo/whMat';
const ResourceContent = (node) => {
@@ -47,10 +49,6 @@
return user;
case 'operationRecord':
return operationRecord;
- case 'customer':
- return customer;
- case 'shipper':
- return shipper;
case 'matnr':
return matnr;
case 'matnrGroup':
@@ -71,6 +69,14 @@
return dictType;
case 'dictData':
return dictData;
+ case 'companys':
+ return companys;
+ case 'serialRuleItem':
+ return serialRuleItem;
+ case 'serialRule':
+ return serialRule;
+ case 'whMat':
+ return whMat;
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1