Merge remote-tracking branch 'origin/master'

liusheng

昨天 d1533f3fe617a98eb8782047e4c4ad81f3924fcf

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