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

Pu Zhibing

2 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

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

@@ -91,11 +91,6 @@
    @TableField("jump_type")
    private Integer jumpType;

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

    @Override
    protected Serializable pkVal() {