Merge remote-tracking branch 'origin/master'

zhangxu

2022-08-09 dd0a3f9a6612d0c419e36260836b87f57a9bd2d3

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

@@ -13,6 +13,8 @@
public class OrderItemCouponDto {
    /**商品类型*/
    private Integer goodsType;
    /**his商品类型*/
    private String hisGoodsType;
    /**商品标识*/
    private String goodsId;
    /**sku标识*/