Merge branch 'master' into master-test

wangrenhuang

2023-11-23 e69d8ab491d1a41838ac2226d30712861cd7c27b

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java

@@ -33,5 +33,10 @@

    /** 可退总金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;

    /** 平摊积分（用于系统返回参数计算）*/
    private BigDecimal averageIntegral = BigDecimal.ZERO;

}