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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

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

@@ -19,4 +19,6 @@
    private Integer sort;
    @ApiModelProperty("背景图")
    private String backgroundImage;
    @ApiModelProperty("详情id")
    private Integer id;
}