From 210988b56322931b9e0c91194f5c50f84b007688 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:21:34 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/ResourceContent.js | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 3a8765b..b5b46b3 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -25,6 +25,8 @@
import dictType from './system/dicts/dictType';
import dictData from './system/dicts/dictData';
import companys from './basicInfo/companys';
+import locType from './basicInfo/locType';
+import locArea from './basicInfo//locArea';
import serialRuleItem from './system/serialRuleItem';
import serialRule from './system/serialRule';
import whMat from './basicInfo/whMat';
@@ -100,6 +102,11 @@
return fields;
case 'fieldsItem':
return fieldsItem;
+ case 'locType':
+ return locType;
+ case 'locArea':
+ return locArea;
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1