Commit 38e1447abecad64d27e17fb634b1a8a7465a7eaa

Authored by 后端研发-林欢仲
2 parents d1fe8b30 6f1ea2c7

Merge branch '2.0.0-SNAPSHOT' of git.vipzhuang.cn:common/ylp-common-parent into 2.0.0-SNAPSHOT

# Conflicts:
#	pom.xml