Merge branch 'self' into uat

# Conflicts:
#	suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html
#	suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html