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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

 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;
}