Merge remote-tracking branch 'origin/dev-0806-wql' into dev-0806-wql

# Conflicts:
#	tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/register/service/AppRegisterService.java