Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849

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