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

fhx

2024-04-11 b2ad4b914ccaf0c22e382855d18d9bca64f016aa

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

@@ -1,6 +1,7 @@
package com.hz.his.dto.order;

import com.hz.his.dto.PageDto;
import com.hz.his.vo.order.DeliveryAddressVo;
import lombok.Data;

import java.util.List;
@@ -26,6 +27,8 @@
    private List<OrderItemPHisDto> orderItem;
    /**开发人集合 非必填*/
    private List<OrderDeveloperDto> orderDeveloper;
    /**收货地址*/
    private DeliveryAddressVo deliveryAddress;

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