二消航次主键改为id

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/vo/ConsumptionIncomeVoyageRespVO.java

@@ -18,7 +18,7 @@ public class ConsumptionIncomeVoyageRespVO {
     private Integer index;
 
     @Schema(description = "航次ID")
-    private Long voyageId;
+    private Long id;
 
     @Schema(description = "航次名称")
     private String voyageName;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/consumption/ConsumptionIncomeVoyageDO.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 public class ConsumptionIncomeVoyageDO extends BaseDO {
     @TableId(type = IdType.ASSIGN_ID)
-    private Long voyageId;
+    private Long id;
     /**
      * 航次名称
      */