Merge branch 'fhx-prod-复购活动' into master-prod-new

fhx

2024-05-27 2d12c1e7182a0cf34d96536662bb3ca60afe4c0c

 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;