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

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -24,10 +24,20 @@
    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 occupyIntegralDeduction = BigDecimal.ZERO;
    /**分配积分抵扣的金额*/
    private BigDecimal occupyIntegralCash = BigDecimal.ZERO;

}