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

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

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

委托书新增设备状态操作详情

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

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 ...

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

冲突

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

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

空字典不进行校验

我的检测扫描检完功能，任务分发所有功能自测，实验室检测列表自测

状态管理bug修改

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

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

状态管理申请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

原始记录模块提交

流程审批通过后修改设备状态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

客户基本信息模块bug

git版本退回 拉代码提交