Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-06 703d5e3dcae6207ed85b0ce6d05f37ca0a36dc36

 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;