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

Pu Zhibing

3 天以前 e7b5f646387af071b879808cef410a698de684d6

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java

@@ -56,6 +56,16 @@
    @TableField("target_type")
    private Integer targetType;
    /**
     * 链接类型1.跳转地址，2、跳转小程序
     */
    @TableField("link_type")
    private Integer linkType;
    /**
     * 小程序appid
     */
    @TableField("appid")
    private String appid;
    /**
     * 链接地址
     */
    @TableField("link_url")