Merge branch 'developer' into developerA

# Conflicts:
#	src/main/java/com/caimei/service/auth/impl/LogisticsServiceImpl.java