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

chenyabin

2021-04-15 03c94a9079454f7d894b66bc4855e880aeee4e49

 src/conf/Constants.js

@@ -9,7 +9,7 @@
export const logicMapper = {
  wasteGasPfk: 'WasteGas.js',
  wasteWaterPfk: 'WasteWater.js',
  wasteSolidCcd: 'SolidWaste.js',
  wasteSolidCcd: 'WasteSolid.js',
  sewersAreaGs: 'Company.js',
  pipesegment: 'PipeLineAnimal.js'
}