Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

2 天以前 3e7932d378b607f75379b463ae4ae2f4f1ccfe12

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

@@ -56,10 +56,15 @@
    @TableField("target_type")
    private Integer targetType;
    /**
     * 链接类型1.手动输入2.选择已有
     * 链接类型1.跳转地址，2、跳转小程序
     */
    @TableField("link_type")
    private Integer linkType;
    /**
     * 小程序appid
     */
    @TableField("appid")
    private String appid;
    /**
     * 链接地址
     */
@@ -81,6 +86,12 @@
    @TableField("jump_type")
    private Integer jumpType;

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

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