委托书样品列表新增样品名称编号查询

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

1、证书打印合成路径\/名称

标准装置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、配置上传bug自测 ...

2、证书打印合成路径\/问题修改

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

现场检测记录功能提交

1、模块下载、APP下载

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

1、证书打印自测，证书类型存在bug ...

2、新增模块导入下载、app软件上传等功能
3、修改证书打印报告合成,打印报告获取证书名称bug

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

现场检测记录部分功能提交

generator表business_site_executive_info_equipment_relation

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

Conflicts:

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

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

1、证书报告新增流程id，列表和详情新增相应返回参数 ...

2、新增证书合成电子签章认证章自动化生成
3、证书合成流程bug修改

文件打印合成测试

1、设备收发单增加扫描接口 ...

2、设备收发增加扫描后，批量状态更新接口

版本冲突

1、样品列表场景整理、委托书页面、交接单页面、分包页面 ...

2、设备收发新增标签扫描返还列表接口
3、设备收发新增归还时间维护
4、其他bug修改

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、证书打印导出bug修改
3、证书打印合成新增一下内容：
    (1) doc转换为docx文件
    (2) 注册工具类变更更抽象
    (3) 增加非关键绝对路径图片合成
    (4) 完善业务模块流程代码，对业务代码抽象

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

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

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