Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2022-11-04 6b58d7bb656762d362a15fb34c14db21c0601dc8

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

@@ -18,14 +18,20 @@
    private String operatorId;
    /**操作人名称*/
    private String operatorName;
    /**活动标识*/
    private String groupBuyId;
    private String id;
    /**发送记录*/
    private CouponRecordDto couponReleaseRecordItem;
    /**用户详情*/
    private List<UserArrDto> userArr;


    private List<CouponItemDto> itemDtoList;

    /**修改时间*/
    private String updateTime;

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

}