Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-08 23f822a32e39114dfcffd073c516ac3b39f03b16

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

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

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

}