Merge branch 'master-prod-new' into master-test

fhx

2024-06-05 6421ed3f99fe5786991b48a8d3e104ce76275de7

 phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java

@@ -12,4 +12,6 @@
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单信息*/
    private OrdersTotalDto ordersTotalDto;
    /**退费统计类型(RefundRecord)*/
    private String refundStatistics;
}