order detail improvement

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java

@@ -1,5 +1,6 @@
 package com.bonus.material.order.domain;
 
+import com.bonus.common.core.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +34,16 @@ public class OrderDetailDto {
     @ApiModelProperty(value = "设备ids")
     private List<Integer> maIds;
 
+    /** 设备编码 */
+    @Excel(name = "设备编码")
+    @ApiModelProperty(value = "设备编码")
+    private String code;
+
+    /** 设备唯一标识符，用户输入，比如车架号 */
+    @Excel(name = "设备唯一标识符")
+    @ApiModelProperty(value = "设备唯一标识符")
+    private String identifyCode;
+
     @ApiModelProperty(value = "设备类型id")
     private Integer typeId;
 

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml

@@ -155,6 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOrderDetailsById" resultType="com.bonus.material.order.domain.OrderDetailDto">
         SELECT
             mdi.device_name,
+            mdi.code,
+            mdi.identify_code,
             mt.lease_price as dayLeasePrice,
             hh.order_status,
             hh.days,