Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-test

zhouxiang

2022-12-01 a0c7de34c4539a73e1c08e4dee6609b791dd34c0

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

@@ -169,6 +169,9 @@
    /** 康博佳标识(KoapOrderTotal) */
    private String koapOrderId;

    /**订单总金额的折后金额*/
    private BigDecimal disTotal;

    private OrderInfoDto orderInfo;

    private List<String> activityIds;