1
job文件没有 提交
上传本地job 已让备份
已告知备份
已告知
rar
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPC.sync.job/src/Intime.O2O.ApiClient/DefaultApiClient.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetBrandByIdRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetProductImagesRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetProductsRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetSectionByIdRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetSectionsRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetStoreByIdRequest.cs
	OPC.sync.job/src/Intime.O2O.ApiClient/Request/GetStoresRequest.cs
	OPC.sync.job/src/Intime.OPC.Domain/App.config
	OPC.sync.job/src/Intime.OPC.Domain/Models/IMS_Combo.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/IMS_ComboMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/OPC_RMADetailMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/OPC_RMAMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/OPC_SaleDetailMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/OPC_SaleRMAMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/Mapping/OPC_ShippingSaleMap.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/OPC_RMA.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/OPC_RMADetail.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/OPC_SaleDetail.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/OPC_SaleRMA.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/OPC_ShippingSale.cs
	OPC.sync.job/src/Intime.OPC.Domain/Models/YintaiHZhouContext.cs
	OPC.sync.job/src/Intime.OPC.Job/Order/OrderStatusSync/OrderStatusSync.cs
	OPC.sync.job/src/Intime.OPC.Job/Product/ProductSync/Supports/Intime/Jobs/AllSyncJob.cs
	OPC.sync.job/src/Intime.OPC.Job/Product/ProductSync/Supports/Intime/Processors/BrandSyncProcessor.cs
	OPC.sync.job/src/Intime.OPC.Job/Product/ProductSync/Supports/Intime/Processors/ProductSyncProcessor.cs
	OPC.sync.job/src/Intime.OPC.JobScheduler/Configuration/quartz_jobs.xml
	OPCApp/OPCAPP.DataService/Impl/Customer/CustomerReturnGoodsService.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerSelfNetReturnGoodsViewModel.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerStockoutRemindCommonViewModel.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerStockoutRemindNotReplenishViewModel.cs
	OPCApp/OPCApp.Order/Views/CustomerStockoutRemindCommon.xaml