Merge branch 'master-stander' into master-jiayan

fwq

12 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java

@@ -3,6 +3,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author CJH
@@ -40,5 +41,6 @@
    private Integer isMoneyPayRefund;
    /**转换是否划扣计算：0否1是*/
    private Integer isExecuteRefund;

    /** 其他退款方式 */
    private List<RefundMethodVo> otherRefundMethodList;
}