Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

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