刘佳音-buzhidao
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/service/impl/UserTServiceImpl.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/service/impl/UserTServiceImpl.java
Merge remote-tracking branch 'origin/master'
刘佳音
Merge remote-tracking branch 'origin/master'