Merge remote-tracking branch 'origin/master' into master-test

fwq

2022-12-05 0e8bc2d98c293528e1fd5f98d197a8cef371a7e3

 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;