Merge branch 'master' into master-test

wangrenhuang

2023-03-23 fcf8b677cf0a8165da424b642a9ade51aa91e7e9

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -14,8 +14,10 @@

    /** 退款方式集合 */
    private List<OrderPayMethodDto> refundPayMethod;
    /** 备注 */
    /** 退款备注（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** 退款信息集合 */
    private List<OrderItemRefundDto> refundList;
    /** 订单id */
@@ -43,6 +45,9 @@
    /** 是否自动生成退款单  (0否 1是)   必填*/
    private Integer isRefund;

    /** 退款类型(0:全部退款,1:部分退款) */
    private Integer refundOperationType;

    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;