Merge branch 'master' into master-test

zhangxu

2022-11-23 1c744733a032b1da5d429830268a6314b39eba09

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

@@ -12,7 +12,7 @@
    /**优惠券标识*/
    private String couponId;

    /**标识父标识字符串逗号分隔*/
    /**数量*/
    private Integer num;

}