Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/fire-dto/src/main/java/com/fire/dto/response/BaseRestResponse.java
#	pom.xml