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

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 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;

}