Merge remote-tracking branch 'origin/master'

wangqi

2021-03-18 0584495dc1b5819908d5e5b8aa8bac4feecb3cd2

 src/conf/Constants.js

@@ -27,5 +27,9 @@
  embeddingmode: '埋设方式',
  pipetrenchtype: '管沟类型',
  datecollected: '探测时间',
  operationalstatus: '运行状态'
  operationalstatus: '运行状态',
  acquisitionpeople: '采集人',
  acquisitiondate: '采集日期',
  fourtype: '四通类型',
  fourm: '四通材料'
}