Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mall-server-api/src/main/java/com/gree/mall/manager/utils/CommonUtils.java