Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop


 Conflicts:

	src/components/LayerController/logic/SolidWaste.js

	src/components/LayerController/logic/WasteGas.js

	src/components/LayerController/logic/WasteWater.js