new file:   main/java/com/flyhz/shop/dto/OrderDetailDto.java
	modified:   main/java/com/flyhz/shop/dto/OrderDto.java
	new file:   main/java/com/flyhz/shop/dto/OrderItem.java
	new file:   main/java/com/flyhz/shop/dto/ProductParamDto.java
	modified:   main/java/com/flyhz/shop/persistence/dao/ProductDao.java
	modified:   main/java/com/flyhz/shop/service/OrderService.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlmap/ProductMapper.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/dto/ProductDto.java
	modified:   main/java/com/flyhz/shop/dto/ProductParamDto.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   main/java/com/flyhz/shop/dto/OrderDto.java
	deleted:    main/java/com/flyhz/shop/dto/ProductParamDto.java
	modified:   main/java/com/flyhz/shop/persistence/dao/ProductDao.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/ProductMapper.xml