Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

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

@@ -228,6 +228,7 @@ public class OrderJzDetailController {
       vo.setRemark(detail.getRemark());
       vo.setSignTime(detail.getSignTime());
       vo.setDispatchNo(detail.getDispatchNo());
+        vo.setGroupNo(detail.getGroupNo());
         vo.setBusNumber(detail.getBusNumber());
         vo.setDriverName(detail.getDriverName());
         vo.setDriverPhone(detail.getDriverPhone());
@@ -405,6 +406,7 @@ public class OrderJzDetailController {
       vo.setRemark(detail.getRemark());
       vo.setSignTime(detail.getSignTime());
       vo.setDispatchNo(detail.getDispatchNo());
+        vo.setGroupNo(detail.getGroupNo());
         vo.setBusNumber(detail.getBusNumber());
         vo.setDriverName(detail.getDriverName());
         vo.setDriverPhone(detail.getDriverPhone());

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

@@ -38,25 +38,28 @@ public class OrderJzDetailExportVO {
     @ExcelProperty(value = "分车号", index = 9)
     private String dispatchNo;
 
-    @ExcelProperty(value = "车牌号", index = 10)
+    @ExcelProperty(value = "分车组团号", index = 10)
+    private String groupNo;
+
+    @ExcelProperty(value = "车牌号", index = 11)
     private String busNumber;
 
-    @ExcelProperty(value = "司机姓名", index = 11)
+    @ExcelProperty(value = "司机姓名", index = 12)
     private String driverName;
 
-    @ExcelProperty(value = "司机联系电话", index = 12)
+    @ExcelProperty(value = "司机联系电话", index = 13)
     private String driverPhone;
 
-    @ExcelProperty(value = "接站人员", index = 13)
+    @ExcelProperty(value = "接站人员", index = 14)
     private String receiverName;
 
-    @ExcelProperty(value = "接站人电话", index = 14)
+    @ExcelProperty(value = "接站人电话", index = 15)
     private String receiverPhone;
 
-    @ExcelProperty(value = "分车情况", index = 15)
+    @ExcelProperty(value = "分车情况", index = 16)
     private String dispatchRemark;
 
-    @ExcelProperty(value = "预约情况", index = 16)
+    @ExcelProperty(value = "预约情况", index = 17)
     private String reservationInfo;
 
 }