已写好view，controller
修改数据库sql
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/lxyg/controller/memberloginController.java
	src/main/java/lxyg/controller/registerController.java
	src/main/webapp/WEB-INF/views/about.jsp
	src/main/webapp/WEB-INF/views/binding.jsp
	src/main/webapp/WEB-INF/views/buyersrecommend.jsp
	src/main/webapp/WEB-INF/views/confirm.jsp
	src/main/webapp/WEB-INF/views/customerservice.jsp
	src/main/webapp/WEB-INF/views/feedback.jsp
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/integral.jsp
	src/main/webapp/WEB-INF/views/login.jsp
	src/main/webapp/WEB-INF/views/memberlevel.jsp
	src/main/webapp/WEB-INF/views/modifypicture.jsp
	src/main/webapp/WEB-INF/views/order.jsp
	src/main/webapp/WEB-INF/views/pay.jsp
	src/main/webapp/WEB-INF/views/personalhomepage.jsp
	src/main/webapp/WEB-INF/views/preferential.jsp
	src/main/webapp/WEB-INF/views/product.jsp
	src/main/webapp/WEB-INF/views/register.jsp
	src/main/webapp/WEB-INF/views/shopping.jsp
	src/main/webapp/resources/img/a-11.png
	src/main/webapp/resources/img/a-76.jpg
添加通用型数据操作层及测试