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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java

@@ -18,6 +18,8 @@

    @ApiModelProperty(value = "商品类型： 1实物 2课包 3门票 4优惠券")
    private Integer goodsType;
    @ApiModelProperty(value = "门店id")
    private Integer shopId;

    @ApiModelProperty(value = "搜索内容")
    private String search;