Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java