Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

fwq

2024-06-13 653a27e1cc457f7bc887a6aa81ff00717e4282f4

 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;