民航机型DTO命名空间修改，计划明细DTO相关修改
解决冲突
提交冲突
Merge branch 'master' of https://github.com/UniCloud/FRP

Conflicts:
	Application.AircraftConfigBC/ActionCategoryServices/ActionCategoryAppService.cs
	Application.AircraftConfigBC/AircraftCategoryServices/AircraftCategoryAppService.cs
	Application.AircraftConfigBC/AircraftConfigurationServices/AircraftConfigurationAppService.cs
	Application.AircraftConfigBC/AircraftLicenseServices/AircraftLicenseAppService.cs
	Application.AircraftConfigBC/AircraftServices/AircraftAppService.cs
	Application.AircraftConfigBC/AircraftTypeServices/AircraftTypeAppService.cs
	Application.AircraftConfigBC/ManufacturerServices/ManufacturerAppService.cs
	Application.CommonServiceBC/DocumnetSearch/DocumentSearchAppService.cs
	Application.FleetPlanBC/AirProgrammingServices/AirProgrammingAppService.cs
	Application.FleetPlanBC/AircraftConfigurationServices/AircraftConfigurationAppService.cs
	Application.FleetPlanBC/AircraftPlanHistoryServices/PlanHistoryAppService.cs
	Application.FleetPlanBC/AircraftSeriesServices/AircraftSeriesAppService.cs
	Application.FleetPlanBC/AircraftServices/AircraftAppService.cs
	Application.FleetPlanBC/AirlinesServices/AirlinesAppService.cs
	Application.FleetPlanBC/AnnualServices/AnnualAppService.cs
	Application.FleetPlanBC/ApprovalDocServices/ApprovalDocAppService.cs
	Application.FleetPlanBC/CAACAircraftTypeServices/CAACAircraftTypeAppService.cs
	Application.FleetPlanBC/CaacProgrammingServices/CaacProgrammingAppService.cs
	Application.FleetPlanBC/EngineServices/EngineAppService.cs
	Application.FleetPlanBC/EngineTypeServices/EngineTypeAppService.cs
	Application.FleetPlanBC/MailAddressServices/MailAddressAppService.cs
	Application.FleetPlanBC/ManagerServices/ManagerAppService.cs
	Application.FleetPlanBC/ManufacturerServices/ManufacturerAppService.cs
	Application.FleetPlanBC/ProgrammingFileServices/ProgrammingFileAppService.cs
	Application.FleetPlanBC/ProgrammingServices/ProgrammingAppService.cs
	Application.FleetPlanBC/RequestServices/RequestAppService.cs
	Application.FleetPlanBC/SupplierServices/SupplierAppService.cs
	Application.FleetPlanBC/XmlConfigServices/XmlConfigAppService.cs
	Application.FleetPlanBC/XmlSettingServices/XmlSettingAppService.cs
	Application.PartBC/AcDailyUtilizationServices/AcDailyUtilizationAppService.cs
	Application.PartBC/AdSbServices/AdSbAppService.cs
	Application.PartBC/AirStructureDamageServices/AirStructureDamageAppService.cs
	Application.PartBC/AircraftServices/AircraftAppService.cs
	Application.PartBC/AircraftTypeServices/AircraftTypeAppService.cs
	Application.PartBC/BasicConfigGroupServices/BasicConfigGroupAppService.cs
	Application.PartBC/BasicConfigServices/BasicConfigAppService.cs
	Application.PartBC/ConfigGroupServices/ConfigGroupAppService.cs
	Application.PartBC/ContractAircraftServices/ContractAircraftAppService.cs
	Application.PartBC/CtrlUnitServices/CtrlUnitAppService.cs
	Application.PartBC/MaintainCtrlServices/MaintainCtrlAppService.cs
	Application.PartBC/MaintainWorkServices/MaintainWorkAppService.cs
	Application.PartBC/ModServices/ModAppService.cs
	Application.PartBC/OilMonitorServices/OilMonitorAppService.cs
	Application.PartBC/PnRegServices/PnRegAppService.cs
	Application.PartBC/ScnServices/ScnAppService.cs
	Application.PartBC/SnRegServices/SnRegAppService.cs
	Application.PartBC/SpecialConfigServices/SpecialConfigAppService.cs
	Application.PaymentBC/ContractEngineServices/ContractEngineAppService.cs
	Application.PaymentBC/CurrencyServices/CurrencyAppService.cs
	Application.PaymentBC/GuaranteeServices/GuaranteeAppService.cs
	Application.PaymentBC/InvoiceServices/CreditNoteAppService.cs
	Application.PaymentBC/InvoiceServices/LeaseInvoiceAppService.cs
	Application.PaymentBC/InvoiceServices/PrepaymentInvoiceAppService.cs
	Application.PaymentBC/InvoiceServices/PurchaseInvoiceAppService.cs
	Application.PaymentBC/MaintainContractServices/MaintainContractAppService.cs
	Application.PaymentBC/MaintainInvoiceServices/MaintainInvoiceAppService.cs
	Application.PaymentBC/OrderServices/OrderAppService.cs
	Application.PaymentBC/PaymentNoticeServices/PaymentNoticeAppService.cs
	Application.PaymentBC/PaymentScheduleServices/PaymentScheduleAppService.cs
	Application.PaymentBC/SupplierServices/SupplierAppService.cs
	Application.PurchaseBC/ActionCategoryServices/ActionCategoryAppService.cs
	Application.PurchaseBC/AircraftTypeServices/AircraftTypeAppService.cs
	Application.PurchaseBC/ContractAircraftServices/LeaseContractAircraftAppService.cs
	Application.PurchaseBC/ContractAircraftServices/PurchaseContractAircraftAppService.cs
	Application.PurchaseBC/ForwarderServices/ForwarderAppService.cs
	Application.PurchaseBC/PlanAircraftServices/PlanAircraftAppService.cs
	Application.PurchaseBC/ReceptionServices/AircraftLeaseReceptionAppService.cs
	Application.PurchaseBC/ReceptionServices/AircraftPurchaseReceptionAppService.cs
	Application.PurchaseBC/ReceptionServices/EngineLeaseReceptionAppService.cs
	Application.PurchaseBC/ReceptionServices/EnginePurchaseReceptionAppService.cs
	Application.PurchaseBC/SupplierServices/SupplierAppService.cs
	Application.PurchaseBC/TradeServices/TradeAppService.cs