Merge branch '20201127_coco配送进程' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -391,7 +391,7 @@ public class OrderController {
      */
     @ApiAnnotation(logMessage = "queryOrderRider")
     @PostMapping("/queryOrderRider")
-    public BaseResponse<OrderRiderResponseVo> queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
+    public BaseResponse queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
         return orderservice.queryOrderRider(requestVo);
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1202,7 +1202,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
-    public BaseResponse<OrderRiderResponseVo> queryOrderRider(OrderRiderRequestVo requestVo) {
+    public BaseResponse queryOrderRider(OrderRiderRequestVo requestVo) {
         AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(requestVo.getSessionId());
         if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);