Merge remote-tracking branch 'origin/master' into xin

# Conflicts:
#	oying-system/src/main/java/com/oying/modules/message/service/MessageSystemAdvertiseService.java
#	oying-system/src/main/java/com/oying/modules/pc/product/service/ProductCategoryService.java
#	oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java
#	oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java
#	oying-system/src/main/java/com/oying/modules/system/domain/User.java
#	oying-system/src/main/java/com/oying/modules/system/service/UserMerchantService.java
#	oying-system/src/main/resources/mapper/system/UserMapper.xml
#	oying-tools/src/main/java/com/oying/utils/SendMessageUtils.java
#	oying-tools/src/main/java/com/oying/utils/WinnerLookEnum.java