Commit 02c45e405f929be9daf5600cd93fc3b932b7ded8

Authored by airhead
2 parents 72883aa9 8527bd3c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yudao-dependencies/pom.xml