From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/event-handling/res-info/EmergRes.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/event-handling/res-info/EmergRes.js b/src/components/base-page/enterprise-emergency/event-handling/res-info/EmergRes.js
index a038857..2a8da25 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/res-info/EmergRes.js
+++ b/src/components/base-page/enterprise-emergency/event-handling/res-info/EmergRes.js
@@ -45,7 +45,7 @@
},
{
label: '鐗╄祫鏁伴噺',
- prop: 'RESOURCESNUMBER',
+ prop: 'resourcesnumber',
width: 'auto'
},
{
@@ -55,12 +55,12 @@
},
{
label: '璐熻矗浜�',
- prop: 'RESPERSON',
+ prop: 'resperson',
width: 'auto'
},
{
label: '琛屾斂闅跺睘',
- prop: 'ADMINZONENAME',
+ prop: 'adminzonename',
width: 'auto'
}
]
@@ -74,37 +74,37 @@
},
{
label: '闃熶紞鍚嶇О',
- prop: 'TEAMNAME',
+ prop: 'teamname',
width: 'auto'
},
{
label: '搴旀�ョ數璇�',
- prop: 'PHONE',
+ prop: 'phone',
width: 'auto'
},
{
label: '浜哄憳鏁伴噺',
- prop: 'ORGANIZATION',
+ prop: 'organization',
width: 'auto'
},
{
label: '鏄惁澶栧崗鍗曚綅',
- prop: 'EXTERNALTEAM',
+ prop: 'externalteam',
width: 'auto'
},
{
label: '琛屾斂闅跺睘',
- prop: 'ADMINISTRATIVESUBORDINATE',
+ prop: 'administrativesubordinate',
width: 'auto'
},
{
label: '鍦板潃',
- prop: 'ADDRESS',
+ prop: 'address',
width: 'auto'
},
{
label: '鎵�灞炲崟浣嶅悕绉�',
- prop: 'UNITNAME',
+ prop: 'unitname',
width: 'auto'
},
{
--
Gitblit v1.8.0