同步
同步
Merge branch 'dev' of https://github.com/UniCloud/AHM into dev
航站同步
Merge branch 'dev' of https://github.com/UniCloud/AHM into dev

Conflicts:
	AHM.Web/Scripts/ViewModel/TransCode/ManageFlightTaskViewModel.js
	Application.TransCodeBC.Service/TransCodeModule/TransCodeAppService.cs
	Application.TransCodeBC/TransCodeModule/ITransCodeAppService.cs
	DistributedServices.TransCode/TransCodeData.cs
同步