修改一些BUG,将文件相关的初步代码上传上来
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/map/src/main/java/com/zxy/map/framework/client/entity/PointType.java
	framework/map/src/main/resources/applicationContext.xml