Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -11,8 +11,17 @@

    /**优惠券标识*/
    private String couponId;

    /**数量*/
    private Integer num;

    //多优惠券发放时使用字段
    /**批次号名称*/
    private String recordName;
    /**公共标识*/
    private String commonId;
    /**公共子标识*/
    private String commonItemId;
    /**公共类型(CouponRecordDto)*/
    private String commonType;

}