Merge remote-tracking branch 'origin/master'

mitao

2024-03-06 51527a6e817a6ba73b29b07e94a7e879a86f8eaf

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java

@@ -25,6 +25,9 @@
    @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
    private Integer targetType;

    @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
    private Integer linkType;


    @ApiModelProperty(value = "链接地址")
    private String linkUrl;