Merge branch 'master-prod-new' into master-test

fwq

2023-08-16 90fba4723f18cd5b8d23ec9cab857617ee6729b8

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

@@ -19,14 +19,14 @@
    private String operatorName;

    /**操作备注*/
    private Integer operatorRemark;
    private String operatorRemark;

    /**来源标识-必填*/
    /**来源标识*/
    private String commonId;
    /**来源类型 CouponReleaseRecordItem*/
    private String commonType;

    /**发送的优惠券详情-必填*/
    private List<CouponSendUserDto> sendList;
    /**发送的券信息-必填*/
    private List<CouponSendItemDto> couponList;

}