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修改

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

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

测试委托书，分发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

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

打印证书查询接口联调bug,增加表单id

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

放开交接单 样品查询权限

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

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

证书到期提醒,消息推送修改,工作台问题修改

证书到期提醒,消息推送修改完善

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

Conflicts:

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

	casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java