回头率业务活跃度业务
修改样式，及添加验证
修改样式，及添加验证
修改样式，及添加验证
修改样式，及添加验证,修改页面，部分业务实现
修改样式，及添加验证,修改页面，部分业务实现
修改index
删除冗余代码，修改新老业务dao
删除冗余代码，修改新老业务dao
删除冗余代码，修改新老业务dao
删除冗余代码，修改新老业务dao
删除冗余代码，修改新老业务dao
Merge origin/dev into dev

Conflicts:
	wifi-main/src/main/java/com/jyzn/wifi/dao/shop/ValidateLogDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/shop/ShopService.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/main/webapp/WEB-INF/page/shop/basePath.html
	wifi-main/src/main/webapp/WEB-INF/page/shop/index.html
	wifi-main/src/main/webapp/resource/script/paging/index.html
	wifi-main/src/main/webapp/resource/shop/css/shop-item.css
	wifi-main/src/main/webapp/resource/shop/script/jeekly.tools.js
	wifi-main/src/main/webapp/resource/shop/script/main.js
	wifi-main/src/main/webapp/resource/shop/script/main2.js
	wifi-main/src/main/webapp/resource/shop/script/main3.js
	wifi-main/src/main/webapp/resource/shop/script/main4.js
	wifi-main/src/main/webapp/resource/shop/script/main4page.js
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/dao/ValidateLogDaoTest.java
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/service/ShopServiceTest.java
Merge origin/dev into dev

Conflicts:
	wifi-main/src/main/java/com/jyzn/wifi/dao/shop/ValidateLogDao.java
	wifi-main/src/main/java/com/jyzn/wifi/service/shop/ShopService.java
	wifi-main/src/main/java/com/jyzn/wifi/web/SystemCommonController.java
	wifi-main/src/main/webapp/WEB-INF/page/shop/basePath.html
	wifi-main/src/main/webapp/WEB-INF/page/shop/index.html
	wifi-main/src/main/webapp/resource/script/paging/index.html
	wifi-main/src/main/webapp/resource/shop/css/shop-item.css
	wifi-main/src/main/webapp/resource/shop/script/jeekly.tools.js
	wifi-main/src/main/webapp/resource/shop/script/main.js
	wifi-main/src/main/webapp/resource/shop/script/main2.js
	wifi-main/src/main/webapp/resource/shop/script/main3.js
	wifi-main/src/main/webapp/resource/shop/script/main4.js
	wifi-main/src/main/webapp/resource/shop/script/main4page.js
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/dao/ValidateLogDaoTest.java
	wifi-main/src/test/java/com/jyzn/wifi/test/shop/service/ShopServiceTest.java