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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java

@@ -25,4 +25,6 @@
    private Integer turnId;
    @ApiModelProperty("跳转模块")
    private String model;
    @ApiModelProperty("跳转列表类型id")
    private Integer typeId;
}