Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

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