Merge branch 'fhx-prod-秒杀日历' into master-test

fhx

2024-07-25 ab886163b7291ef0de27cf8fad63eb80c5fc6107

 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;