Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 7a512d4a8b10fad9fb0aa75d6105955f033e1ee9

 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;