Merge branch 'master-prod-new' into master-test

Andru

2023-11-08 2623b35166b8e08246b3ef5233b9e411125abd80

 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;