Merge remote-tracking branch 'origin/master'

xuhy

昨天 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java

@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -47,6 +48,9 @@
    @ApiModelProperty(value = "点位id")
    @TableField("location_id")
    private String locationId;
    @ApiModelProperty(value = "距离 米")
    @TableField(exist = false)
    private BigDecimal distance;

    @ApiModelProperty(value = "巡检员id 对应sys_user表")
    @TableField("patrol_inspector")