Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-08 23f822a32e39114dfcffd073c516ac3b39f03b16

 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;