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

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

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

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

Conflicts:

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

证书报告查询bug修复

已取消实例再次提交，原有实例处理

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

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

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

联调

联调

培训计划增加APP端查询参数

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

证书报告审批通过后 更新样品有效期

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

1、设备收发新增状态完成状态后置实验室处理 ...

2、新增编号前缀查询功能
3、新增设备收发消息催办
4、其他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

证书接口提交

测试bug修改

测试bug修改

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

2、变更

业务调度模块bug修改