Merge remote-tracking branch 'origin/master'

陈昶聿

15 小时以前 0d10bc99eec75672b049339399e4f762fbd9746e

 smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java

@@ -27,6 +27,8 @@
    @ApiModelProperty(value = "tokenUrl")
    public String url;

    @ApiModelProperty(value = "360Url")
    public String url360;
}