modified:   main/java/com/flyhz/shop/dto/Product.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/java/com/flyhz/shop/dto/Product.java

	modified:   main/java/com/flyhz/framework/FinderConfig.java
	deleted:    main/java/com/flyhz/framework/auth/AbstractWebUserController.java
	modified:   main/java/com/flyhz/framework/auth/EntityDto.java
	modified:   main/java/com/flyhz/framework/auth/IAuth.java
	deleted:    main/java/com/flyhz/framework/controller/LoginController.java
	modified:   main/java/com/flyhz/framework/lang/AccessInterceptor.java
 	deleted:    main/java/com/flyhz/framework/lang/BusinessException.java
 	modified:   main/java/com/flyhz/framework/lang/FinderExceptionHandler.java
	new file:   main/java/com/flyhz/framework/lang/Protocol.java
	new file:   main/java/com/flyhz/framework/lang/ValidateException.java
	modified:   main/java/com/flyhz/framework/lang/content/FinderJsonView.java
	modified:   main/java/com/flyhz/framework/lang/file/FileUploadCancelException.java
	renamed:    main/java/com/flyhz/framework/auth/PropDto.java -> main/java/com/flyhz/framework/lang/log/PropDto.java
	modified:   main/java/com/flyhz/shop/dto/Product.java
	modified:   main/java/com/flyhz/shop/service/ShoppingCartService.java
	modified:   main/java/com/flyhz/shop/service/UserService.java
	modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	renamed:    main/java/com/flyhz/framework/controller/FileController.java -> main/java/com/flyhz/shop/web/controller/FileController.java
	new file:   main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   main/resources/spring/applicationContext-service.xml
	modified:   main/resources/spring/finder-servlet-context.xml