Merge branch 'master-modify-background-bug-hf' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -51,6 +51,8 @@ public class OrderListVo extends BaseOrder {
 
     private List<OrderItem> items;
 
+    @ApiModelProperty(value = "车辆编号")
+    private Integer vehicleCode;
 
     @ApiModelProperty(value = "用户职位名称")
     private String jobTitle;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -225,6 +225,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     log.info("获取车辆信息返回消息：{}", restResponse.getData());
                     if (restResponse.getData() != null) {
                         orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
+                        orderPageVO.setVehicleCode(restResponse.getData().getCode());
                     }
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
                         try {