Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of…

Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -247,9 +247,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         if(StringUtils.isNotBlank(confirmOrderRequest.getExpectTime())  && timeout != 0){
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(2);
-            orderTask.setTaskTime(confirmOrderRequest.getExpectTime());
+            orderTask.setProcessingTime(confirmOrderRequest.getExpectTime());
             Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(confirmOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
-            orderTask.setProcessingTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
             orderTask.setTimeout(timeout);
             request.setTimeout(0);
             request.setOrderTask(orderTask);