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

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyagestockdetail/VoyageStockDetailLogDO.java

@@ -28,7 +28,7 @@ public class VoyageStockDetailLogDO extends TenantBaseDO {
      * 主键
      */
     @TableId(type = IdType.ASSIGN_ID)
-    private Long ID;
+    private Long id;
     /**
      * 航次ID
      */

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteRespVO.java

@@ -88,4 +88,7 @@ public class ResourceRouteRespVO {
     @Schema(description = "行程总时长")
     private String duration;
 
+    @Schema(description = "航线图片")
+    private String routeImg;
+
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteSaveReqVO.java

@@ -60,4 +60,8 @@ public class ResourceRouteSaveReqVO {
 
     @Schema(description = "行程晚数")
     private Integer nightNum;
+
+
+    @Schema(description = "航线图片")
+    private String routeImg;
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/route/ResourceRouteDO.java

@@ -98,4 +98,9 @@ public class ResourceRouteDO extends BaseDO {
      */
     private Integer nightNum;
 
+    /**
+     * 航线图片
+     */
+    private String routeImg;
+
 }