Merge remote-tracking branch 'origin/master'

ANDRU-PC\Andru

2022-08-10 c800715e798d45e50aa6b8e6930a7a680526177d

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

@@ -17,7 +17,9 @@
    /**sku标识*/
    private String skuId;
    /**商品类型*/
    private String goodType;
    private Integer goodType;
    /**his商品类型*/
    private String hisGoodType;
    /**商品金额*/
    private BigDecimal price;
}