From c3949ec79f06e7bdee9c3a12367bd97ddf46e033 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 24 二月 2025 15:28:38 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev --- rsf-admin/src/page/ResourceContent.js | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js index 4fe2594..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'; @@ -25,6 +23,7 @@ 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': @@ -71,6 +66,8 @@ return dictType; case 'dictData': return dictData; + case 'companys': + return companys; default: return { list: ListGuesser, -- Gitblit v1.9.1