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

mitao

2025-04-11 f4894c44735012e51b7f3ade126b5bf9d7757202

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

@@ -37,5 +37,9 @@
     * 排序
     */
    private Integer sort;
    
    /**
     * 展示类型 1：横屏 2：竖屏
     */

    private Integer displayType;
}