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

fwq

2023-08-16 9262bdcf620f195b63599926fac39edbdc315749

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

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

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

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