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

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

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

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


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