Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

 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
@@ -17,7 +18,7 @@
    /**sku标识*/
    private String skuId;
    /**spu商品分类*/
    private Integer type;
    private List<String> typeList;
    /**商品类型*/
    private Integer goodType;
    /**his商品类型*/