Merge remote-tracking branch 'origin/master-base' into master-prod-new

rx

2024-08-05 d621324bcf6c5a26f058b24e0f4d2930f41840f4

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

@@ -11,12 +11,12 @@
 */
@Data
public class OrderItemIntegralVo {
    /**必填 原积分*/
    /**必填 原价积分*/
    private BigDecimal originalIntegral;
    /**必填 销售积分*/
    /**必填 售价积分*/
    private BigDecimal saleIntegral;
    /**必填 原总积分*/
    /**必填 原价总积分*/
    private BigDecimal originalTotal;
    /**必填 销售总积分*/
    /**必填 售价总积分*/
    private BigDecimal saleTotal;
}