现场检测审批功能模块初步提交

Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java

标准装置关联子表相关逻辑修改,测量设备bug修改

分包方项目申请模块优化

listeners包变更位置，挪移到service模块

分包方项目申请模块

合同管理、业务结算、分包管理、现场检测代码生成，分包方资格审批、现场检测审批列表功能

证书报告审批通过，完成证书打印流程设计，定制化证书参数待开发

由于证书打印从证书报告拆分出新的表格，现对以下接口进行了变更 ...

1、证书打印列表
2、证书打印相关审批
3、证书打印详情页面
4、证书报告审批通过，生成证书打印

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

通过名字/编号查询设备与样品,测试bug修改

联调

证书接口联调问题修改提交

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev ...

Conflicts:

	casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java

	casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java

	casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml

	casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java

	casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java

证书接口提交

1、根据客户id、样品id查询证书列表修改未知 ...

2、变更

业务调度模块bug修改

修改常量类引用，样品列表检定记录列表

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev

原始记录细节优化、证书报告列表查询修改

通知公告设置用户已读功能

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev

证书打印联调打印状态不生效，导出情况，待审批列表ids不生效

证书打印联调打印状态不生效，导出情况，待审批列表ids不生效

计量人员,测量设备bug修改

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

计量人员详情-计量工作培训记录接口补充

工作台工作提醒列表、已读状态变更，单元测试示例，溯源供方增加标准装置关联

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev

1、证书报告模块流程及相应的查询提交