Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-05-29 de7390c66ef3e3fe316e804495a78d05a01f0160

 src/components/base-page/enterprise-emergency/event-handling/res-info/PipeInfo.js

@@ -1,5 +1,5 @@
export default {
  id: 4,
  id: 5,
  name: '管道信息',
  child: [
    {