1
1
Merge branch 'master' of github.com:dzfking007/cxyshw

Conflicts:
	coderlife-parent-1.0.0/coderlife-webapp/src/main/java/com/kedacom/coderlife/controller/LoginController.java
	coderlife-parent-1.0.0/coderlife-webapp/webapp/WEB-INF/classes/com/kedacom/coderlife/controller/LoginController.class
Merge branch 'master' of github.com:dzfking007/cxyshw
Merge branch 'master' of github.com:dzfking007/cxyshw
a