New changelist
Merge pull request #1 from liangji101/master

init commit for shop frontend
Merge branch 'master' of https://github.com/allen2/jy
wewew
222
222
update shop cart js
Merge branch 'master' of github.com:allen2/jy

Conflicts:
	src/main/java/com/renren/ntc/sg/util/ReadExcel.java
add order confirm page