Merge branch '2.7.x' of https://gitlab.yiring.com/basic/basic-api-boot into 2.7.x

# Conflicts:
#	build.gradle