From fcf8b677cf0a8165da424b642a9ade51aa91e7e9 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期四, 23 三月 2023 18:31:56 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java index c86229e..6ce4870 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java +++ b/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; + /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭~*/ private Integer platformSource; -- Gitblit v1.8.0