添加了login模块的controller和service
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/synnex/controller/GenericController.java