Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

 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;


}