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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -23,4 +23,8 @@
    private String type;
    @ApiModelProperty("跳转页面Id")
    private Integer turnId;
    @ApiModelProperty("跳转模块")
    private String model;
    @ApiModelProperty("跳转列表类型id")
    private Integer typeId;
}