From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 e05dee0..d956e15 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
@@ -26,6 +26,8 @@
     private String remarks;
     /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
     private String refundReason;
+    /** Y-鑷姩浣滃簾鍒掓墸  0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/
+    private Integer deductionCancel = 0;
 
     /** 鎿嶄綔浜哄憳宸ユ爣璇�*/
     private String operatorId;

--
Gitblit v1.8.0