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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupStore.java

@@ -44,5 +44,8 @@
     */
    @TableField("sort")
    private Integer sort;
    

    @TableField("displayType")
    private Integer displayType;

}