2014.4.17 13:05
bug修复
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/springapp/mvc/web/customer/controller/CustomerController.java
	src/main/webapp/WEB-INF/pages/customer/customer_detail.jsp
Merge remote-tracking branch 'origin/master'
2014.4.17 14:39
bug修复