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

委托书操作列表新增处理类型字段

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

计量模块工作台bug修改,计量人员编辑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 ...

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

1、原始记录细节修改提交（字典值转换，根据多选导出等） ...

2、证书报告模块初步功能提交（新增、详情）

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

计量模块工作台bug修改,计量人员编辑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

注释规范问题，代码习惯编写的命名错误

培训计划审批、文件审批查询增加时间范围入参

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

交接单、客户小bug

审批通过消息推送，实验室检测登录用户与检测人员id转换

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

交接单详情字段添加

设备使用记录，设备状态变更记录接口bug修改

设备使用记录，设备状态变更记录接口开发

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

# Conflicts:
#	casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java

冲突

设备收发字段变更，证书打印提交