Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-19 40348fdd0205d4a7c16bb5e732e51324ed580f64

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java

@@ -14,6 +14,8 @@
public class GoodsUsedCouponDto extends PageDto {
    /**用户标识*/
    private String userId;
    /**团购活动标识*/
    private String groupBuyId;
    /**商品类型*/
    private Integer goodType;
    /**his商品类型*/
@@ -21,5 +23,7 @@
    /**平台*/
    private String platform;
    /**sku标识*/
    private List<String> couponIdList;
    /**sku标识*/
    private List<GoodsCanUseCouponDto> goodsCanUseCouponDtoList;
}