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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java

@@ -90,4 +90,8 @@
     */
    @TableField("displayType")
    private Integer displayType;

    @TableField("storeId")
    private Integer storeId;

}