Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-09-05 2f2a95fb5b03338b84d8d92a61e9a3281c2495e6

 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;

}