Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

 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;