增加列证件号

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/OrderJzDetailController.java

@@ -223,6 +223,7 @@ public class OrderJzDetailController {
       vo.setIndex(i + 1);
       vo.setOrderNo(detail.getOrderNo());
       vo.setName(detail.getName());
+      vo.setIdCard(detail.getIdCard());
       vo.setPhone(detail.getPhone());
       vo.setRoomModelName(detail.getRoomModelName());
       vo.setRemark(detail.getRemark());
@@ -401,6 +402,7 @@ public class OrderJzDetailController {
       vo.setIndex(i + 1);
       vo.setOrderNo(detail.getOrderNo());
       vo.setName(detail.getName());
+      vo.setIdCard(detail.getIdCard());
       vo.setPhone(detail.getPhone());
       vo.setRoomModelName(detail.getRoomModelName());
       vo.setRemark(detail.getRemark());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/vo/OrderJzDetailExportVO.java

@@ -23,43 +23,46 @@ public class OrderJzDetailExportVO {
     @ExcelProperty(value = "姓名", index = 4)
     private String name;
 
-    @ExcelProperty(value = "联系电话", index = 5)
+    @ExcelProperty(value = "证件号", index = 5)
+    private String idCard;
+
+    @ExcelProperty(value = "联系电话", index = 6)
     private String phone;
 
-    @ExcelProperty(value = "房型", index = 6)
+    @ExcelProperty(value = "房型", index = 7)
     private String roomModelName;
 
-    @ExcelProperty(value = "车次/航班号", index = 7)
+    @ExcelProperty(value = "车次/航班号", index = 8)
     private String remark;
 
-    @ExcelProperty(value = "核销时间", index = 8)
+    @ExcelProperty(value = "核销时间", index = 9)
     private String signTime;
 
-    @ExcelProperty(value = "分车号", index = 9)
+    @ExcelProperty(value = "分车号", index = 10)
     private String dispatchNo;
 
-    @ExcelProperty(value = "分车组团号", index = 10)
+    @ExcelProperty(value = "分车组团号", index = 11)
     private String groupNo;
 
-    @ExcelProperty(value = "车牌号", index = 11)
+    @ExcelProperty(value = "车牌号", index = 12)
     private String busNumber;
 
-    @ExcelProperty(value = "司机姓名", index = 12)
+    @ExcelProperty(value = "司机姓名", index = 13)
     private String driverName;
 
-    @ExcelProperty(value = "司机联系电话", index = 13)
+    @ExcelProperty(value = "司机联系电话", index = 14)
     private String driverPhone;
 
-    @ExcelProperty(value = "接站人员", index = 14)
+    @ExcelProperty(value = "接站人员", index = 15)
     private String receiverName;
 
-    @ExcelProperty(value = "接站人电话", index = 15)
+    @ExcelProperty(value = "接站人电话", index = 16)
     private String receiverPhone;
 
-    @ExcelProperty(value = "分车情况", index = 16)
+    @ExcelProperty(value = "分车情况", index = 17)
     private String dispatchRemark;
 
-    @ExcelProperty(value = "预约情况", index = 17)
+    @ExcelProperty(value = "预约情况", index = 18)
     private String reservationInfo;
 
 }