Merge branch 'master-prod-new' into master-test

Andru

2024-01-04 20c442d28638807774aecae8bc41294cb8c2e0b5

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

@@ -5,6 +5,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author wzh
@@ -16,6 +17,8 @@
    private String userId;
    /**sku标识*/
    private String skuId;
    /**spu商品分类*/
    private List<String> typeList;
    /**商品类型*/
    private Integer goodType;
    /**his商品类型*/