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

puzhibing

2024-03-15 889749753021d76463d85450bd95e6615886956e

 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;

}