Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

# Conflicts:
#	applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java
#	applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java
#	applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java
#	applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java