订单查询增加发货信息

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java

@@ -75,6 +75,12 @@ public class ManagerOrderVO {
     @ApiModelProperty(name = "productInfo", value = "订单商品数据")
     private List<ManagerOrderProductVO> productList;
 
+    @ApiModelProperty(name = "deliveryTime",value = "发货时间",required = true,dataType = "LocalDataTime")
+    private Date deliveryTime;
+
+    @ApiModelProperty(name = "deliverySn",value = "物流单号",required = true,dataType = "String")
+    private String deliverySn;
+
     private String receiverName;
 
     private String receiverPhone;

ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml

@@ -102,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.receiver_city    receiverCity,
         a.receiver_district    receiverDistrict,
         a.receiver_detail_address    receiverDetailAddress,
+        a.delivery_time deliveryTime,
+        a.delivery_sn deliverySn,
 --         b.quantity         buyNum,
 --         b.pic,
 --         b.sp_data          spData,