Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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