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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -75,6 +75,11 @@

    @TableField("typeId")
    private Integer typeId;
    /**
     * displayType展示类型 1：横屏 2：竖屏
     */
    @TableField(exist = false)
    private Integer displayType;


    @Override