Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 937e0e7a3c06aea55d42350268c1aba8e3264eb3

 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;
}