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

fwq

2024-05-17 2a28984276e51d5f6635f3ae62b982b30c442bfd

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java

@@ -47,14 +47,28 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-可退抵扣现金的积分*/
    private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-可退积分抵扣的现金*/
    private BigDecimal approveIntegralCash = BigDecimal.ZERO;

    /**系统计算赋值-分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-分配抵扣现金的积分*/
    private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-分配积分抵扣的现金*/
    private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;

    /**系统计算赋值-退款金额*/
    private BigDecimal refundTotal = BigDecimal.ZERO;
    /**系统计算赋值-退款积分*/
    private BigDecimal refundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-退款抵扣的现金的积分*/
    private BigDecimal refundIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-退款积分抵扣的现金*/
    private BigDecimal refundIntegralCash = BigDecimal.ZERO;

    /**操作类型-系统*/
    public static final String OP_TYPE_SYSTEM = "system";