From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 12 七月 2025 14:42:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TLocation.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TLocation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TLocation.java index b55a00e..96c9c17 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TLocation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TLocation.java @@ -53,17 +53,36 @@ @TableField("location_type") private String locationType; - @ApiModelProperty(value = "点位位置") + @ApiModelProperty(value = "点位位置 起点") @TableField("location_address") private String locationAddress; - @ApiModelProperty(value = "点位经度") + @ApiModelProperty(value = "点位经度 起点") @TableField("location_lon") private String locationLon; - @ApiModelProperty(value = "点位纬度") + @ApiModelProperty(value = "点位纬度 起点") @TableField("location_lat") private String locationLat; + @ApiModelProperty(value = "点位位置 终点") + @TableField("location_address_end") + private String locationAddressEnd; + + @ApiModelProperty(value = "点位经度 终点") + @TableField("location_lon_end") + private String locationLonEnd; + + @ApiModelProperty(value = "点位纬度 终点") + @TableField("location_lat_end") + private String locationLatEnd; + @ApiModelProperty(value = "不合格任务id 用于生成点位不合格预警,多个逗号拼接") + @TableField("unqualified_task_id") + private String unqualifiedTaskId; + + @ApiModelProperty(value = "任务数量") + @TableField(exist = false) + private long taskNum=0; + } -- Gitblit v1.7.1