归档流程修改

归档流程实现文件夹合并功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	HitachiContractProcess/Js/ContractArchive/contract.archive.detail.js

	HitachiContractProcess/UserControls/ContractArchive/ContractArchiveDetail.ascx

	HitachiContractProcess/UserControls/ContractArchive/ContractArchiveDetail.ascx.cs
	HitachiContractProcessCore/ApplicationService/ContractArchiveService.cs
	HitachiContractProcessCore/EDoc2Helper.cs