订单状态流转代码提交

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

@@ -66,4 +66,22 @@ public class OrderDetailDto {
     @ApiModelProperty(value = "修改日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+
+    @ApiModelProperty(value = "出库人")
+    private String preOutboundUser;
+
+    @ApiModelProperty(value = "出库时间")
+    private String preOutboundTime;
+
+    @ApiModelProperty(value = "收货人")
+    private String takeOverUser;
+
+    @ApiModelProperty(value = "收货时间")
+    private String takeOverTime;
+
+    @ApiModelProperty(value = "租赁结束操作人")
+    private String rentOverUser;
+
+    @ApiModelProperty(value = "租赁结束时间")
+    private String rentOverTime;
 }

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

@@ -125,7 +125,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hh.num,
             hh.costs,
             hh.rent_begin_time,
-            hh.rent_end_time
+            hh.rent_end_time,
+            hh.pre_outbound_user,
+            hh.pre_outbound_time,
+            hh.take_over_user,
+            hh.take_over_time,
+            hh.rent_over_user,
+            hh.rent_over_time
         FROM
             ma_order_details hh
                 LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id