Merge remote-tracking branch 'origin/master'

# Conflicts:
#	user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
#	user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
#	user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
#	user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
#	user-server/src/main/resources/mapper/UserMapper.xml