Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 b248e201845e9704cf01f7ac723a64e2570039f4

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

@@ -77,5 +77,9 @@
    @TableField("location_lat_end")
    private String locationLatEnd;

    @ApiModelProperty(value = "任务数量")
    @TableField(exist = false)
    private long taskNum=0;


}