Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

fwq

2024-04-11 e1972e6d92e6b57ecb65eb7998606e620d9f6811

 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java

@@ -140,6 +140,11 @@
    // 是否发送划扣消息 0 否 1 是
    private int isSentNotice = 1;

    //作废划扣原因类型 客诉、升单、退款、治疗效果不满意、误/多划扣、其他
    private String invalidReasonType;
    //作废划扣原因
    private String invalidReason;

    public DeductionDto() {

    }