bug优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportChangeVo.java

 package org.dromara.server.domain.vo;
 
-import java.math.BigDecimal;
-import org.dromara.server.domain.OrderAirportChange;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.server.domain.OrderAirportChange;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 
@@ -36,10 +33,9 @@ public class OrderAirportChangeVo implements Serializable {
     private Long id;
 
     /**
-     * 订单id
+     * 人员code
      */
-    @ExcelProperty(value = "订单id")
-    private Long orderId;
+    private String personCode;
 
     /**
      * 改签编号
@@ -60,7 +56,7 @@ public class OrderAirportChangeVo implements Serializable {
     private String empDepName;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private BigDecimal nfcny;
@@ -78,7 +74,7 @@ public class OrderAirportChangeVo implements Serializable {
     private String idNo;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ocabinName;
@@ -96,7 +92,7 @@ public class OrderAirportChangeVo implements Serializable {
     private String changeOrderStatus;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ntkno;
@@ -132,13 +128,13 @@ public class OrderAirportChangeVo implements Serializable {
     private String voyage;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ovoyageAirportZh;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String nflightNo;
@@ -150,7 +146,7 @@ public class OrderAirportChangeVo implements Serializable {
     private String orderPriceSum;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String otkno;
@@ -180,25 +176,25 @@ public class OrderAirportChangeVo implements Serializable {
     private String psg;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ocabin;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ncabinName;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String npnrNo;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ndepartTime;
@@ -210,13 +206,13 @@ public class OrderAirportChangeVo implements Serializable {
     private String idType;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String oflightNo;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String nvoyageAirportZhn;
@@ -228,13 +224,13 @@ public class OrderAirportChangeVo implements Serializable {
     private BigDecimal serviceFee;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String narriveTime;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String odepartTime;
@@ -246,13 +242,13 @@ public class OrderAirportChangeVo implements Serializable {
     private String changeOrderStatusName;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String opnrNo;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String ncabin;
@@ -276,7 +272,7 @@ public class OrderAirportChangeVo implements Serializable {
     private BigDecimal priceDiff;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private BigDecimal ofcny;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainChangeVo.java

@@ -36,10 +36,9 @@ public class OrderTrainChangeVo implements Serializable {
     private Long id;
 
     /**
-     * 订单id
+     * 人员code
      */
-    @ExcelProperty(value = "订单id")
-    private Long orderId;
+    private String personCode;
 
     /**
      * 改签编号