Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 7ae6e4d6eba358b3cf0fce9f0c6bbee49224c8a2

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/IndexConfigSetDto.java

@@ -18,7 +18,7 @@
    @ApiModelProperty("跳转内容2")
    private String content2;
    @ApiModelProperty("跳转类型2 - 1无2外部链接3商品详情4秒杀商品详情5领卷中心")
    private String direct2;
    private Integer direct2;
    @ApiModelProperty("公司简介")
    private String companyInfo;