Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java

@@ -30,4 +30,7 @@
    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;

    /** 订单升单关联列表 */
    private List<OrderRiseDto> orderRiseList;

}