Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/feignclient/model/SiteVo.java

@@ -19,6 +19,6 @@
    private String siteTime;

    @ApiModelProperty(value = "价格")
    private double price;
    private Double price;

}