Merge branch 'master-stander' into master-jiayan

fwq

14 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 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;