Authored by LUOXC

Merge branch 'hotfix-20190723' into test6.9.9

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java