Merge remote-tracking branch 'origin/master'

陈昶聿

昨天 b73334e984e391cb2ea6b2651e77bf008e127459

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