From ddf99f63ce751b8e5e71ec97ebbe2a9554409cef Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 25 三月 2024 11:26:33 +0800
Subject: [PATCH] Merge branch 'rx-0322-作废划扣补充' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index 1c437e0..6647a22 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -141,9 +141,9 @@
     private int isSentNotice = 1;
 
     //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵c�佸叾浠�
-    private String reasonType;
+    private String invalidReasonType;
     //浣滃簾鍒掓墸鍘熷洜
-    private String reason;
+    private String invalidReason;
 
     public DeductionDto() {
 

--
Gitblit v1.8.0