shopping cart
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into jspImpl
conflict release
fix problem
Add SellerProductService
- Get SellerProduct by Product id
- Get SellerProduct by Seller id
- Get SellerProduct by Product and Seller id
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/webapp/WEB-INF/jsp/goodsDetail.jsp
seller info to product detail
conflictconflictconflict
conf
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/java/edu/cmucdu/ecommerce/dao/product/SellerProductDao.java
	src/main/java/edu/cmucdu/ecommerce/service/product/ProductServiceImpl.java
	src/main/java/edu/cmucdu/ecommerce/web/custom/ProductDetailController.java
	src/main/resources/META-INF/spring/database.properties
solve conflict
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/java/edu/cmucdu/ecommerce/dao/product/SellerProductDao.java
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into jspImpl
solve conflict
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/webapp/WEB-INF/jsp/goodsDetail.jsp