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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -15,6 +15,8 @@
    private Integer type;
    @ApiModelProperty("是否开启（0=否，1=是）")
    private Integer isOpen;
    @ApiModelProperty("置顶（0=否，1=是）")
    private Integer isTop;
    @ApiModelProperty("排序")
    private Integer sort;
    @ApiModelProperty("背景图")