resolve conflicts before merge
resolve merge
modify documents
Merge pull request #317 from jialinsun/master

添加异常告警选项自动添加Dfault和Total选项，修改网络和异常文档