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

ANDRU-PC\Andru

2023-09-27 112f94d84a0051d20761b42e0f5663f3f02c9a63

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -26,6 +26,8 @@
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** Y-自动作废划扣  0否1是（整单退的时候用到）*/
    private Integer deductionCancel = 0;

    /** 操作人员工标识*/
    private String operatorId;