update
Merge branch 'master' of https://github.com/jlclove/jFishing.git

Conflicts:
	src/main/java/com/gudlike/fishing/model/Page.java
	src/main/java/com/gudlike/fishing/model/Point.java
	src/main/java/com/gudlike/fishing/model/PointType.java
	src/main/java/com/gudlike/fishing/service/BaseService.java
	src/main/java/com/gudlike/fishing/service/PointService.java
	src/main/resources/mappers/Point.xml