Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

 phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java

@@ -17,4 +17,6 @@
    private BigDecimal refundTotal;
    /**Y-操作员工*/
    private String employeeId;
    /**N-退款备注*/
    private String remark;
}