update
Merge branch 'master' of https://github.com/archerchey/seeker

Conflicts:
	src/main/java/com/goujia/seeker/business/HandlerBusiness.java
	src/main/java/com/goujia/seeker/business/QueryBusiness.java
	src/main/java/com/goujia/seeker/business/impl/HandlerBusinessImpl.java
	src/main/java/com/goujia/seeker/business/impl/QueryBusinessImpl.java
	src/main/java/com/goujia/seeker/business/impl/SampleBusinessImpl.java
	src/main/java/com/goujia/seeker/business/impl/SeekerBaseBusiness.java
	src/main/java/com/goujia/seeker/model/entity/Shop.java
	src/main/java/com/goujia/seeker/model/vo/ShopVO.java
	src/main/java/com/goujia/seeker/service/QueryService.java
	src/main/java/com/goujia/seeker/service/impl/HandlerServiceImpl.java
	src/main/java/com/goujia/seeker/service/impl/QueryServiceImpl.java
update