From de7390c66ef3e3fe316e804495a78d05a01f0160 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 18:39:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/event-handling/res-info/Surroundings.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/event-handling/res-info/Surroundings.js b/src/components/base-page/enterprise-emergency/event-handling/res-info/Surroundings.js
index 37e05b7..39e51a2 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/res-info/Surroundings.js
+++ b/src/components/base-page/enterprise-emergency/event-handling/res-info/Surroundings.js
@@ -329,12 +329,12 @@
},
{
label: '琛屾斂闅跺睘',
- prop: 'ADMINZONENAME',
+ prop: 'adminzonename',
width: 'auto'
},
{
label: '鎵�灞炲崟浣嶅悕绉�',
- prop: 'UNITNAME',
+ prop: 'unitname',
width: 'auto'
},
{
--
Gitblit v1.8.0