Merge remote-tracking branch 'origin/master'

liusheng

5 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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