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

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

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

@@ -86,6 +86,12 @@
    @TableField("jump_type")
    private Integer jumpType;

    /**
     * 小程序appid
     */
    @TableField("appid")
    private String appid;

    @Override
    protected Serializable pkVal() {
        return this.entryId;