Merge branch 'master-prod-new' into fhx-prod-智能导诊

chenjiahe

2024-05-22 0e50884553dd11fa72101f23ac51143c9f98a871

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

@@ -28,7 +28,7 @@
    /**开发人集合 非必填*/
    private List<OrderDeveloperDto> orderDeveloper;
    /**收货地址*/
    private DeliveryAddressVo deliveryAddressVo;
    private DeliveryAddressVo deliveryAddress;

    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;