# Conflicts:
#	.idea/workspace.xml

      --数据质量核查

      --数据质量核查

# Conflicts:
#	.idea/workspace.xml
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class

# Conflicts:
#	.idea/workspace.xml

      --质量规则维护

      --质量规则维护

模型预览完成

# Conflicts:
#	src/main/java/com/hp/cmsz/web/PageURLController.java
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class

# Conflicts:
#	.idea/workspace.xml
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class

      --欲分析建模--数据模型管理--模型监控

                 监控运营->告警关联诊断模块

--数据质量核查下的质量规则维护子页面选项联动。

Conflicts:
	src/main/java/com/hp/cmsz/web/PageURLController.java

# Conflicts:
#	src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java
#	src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java
#	src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java
#	src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java
#	src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class

--增加数据质量核查功能，包含质量规则维护、过滤规则维护和质量规则运营页面。

--增加预警与隐患分析内部协查等筛选
--预警与隐患分析状态一栏增加内部协查等
--内部协查单跳转到下发协查单页面
--过滤以下发的内部协查等不让重复下发

      --数据库脚本更新

      --模型管理增加字段
      --告警监控-内部协查单功能
      --验收通过

    --模型页面

--模型维护增加模型描述、评判方法、评判标准、数据类型参数。

    --内部协查单生成和展示 关联告警和文件下载完成

--模型维护增加模型描述、评判方法、评判标准、数据类型参数。

    --实现内部协查单页面查询

    --实现自定义协查单告警描述和内部协查单页面

    --实现预警与隐患维护的协查单预览与下发

--预警与隐患维护页面列表上方增加结果预览按钮
--告警详细页面用列表的方式展示选中的多个协查单信息
--告警详细页面给每个协查单添加告警描述，可编辑
--生成协查单页面增加生成内部协查单按钮（功能未实现）