From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 10 ++++++++--
1 files changed, 8 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..b65cdc7 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
@@ -16,6 +16,9 @@
// 鍒掓墸璁板綍id
private String deductionSingleId;
+ /**鍒涘缓鏉ユ簮 0甯歌1鑷姩鐢熸垚锛堢郴缁熻嚜鍔紝鍙備笌鍥炶鎴栬�呭叾浠栵級*/
+ private Integer createType = 0;
+
// 鐢ㄦ埛椤圭洰id
private String userProjectId;
@@ -141,9 +144,12 @@
private int isSentNotice = 1;
//浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵ｃ�佸叾浠�
- private String reasonType;
+ private String invalidReasonType;
//浣滃簾鍒掓墸鍘熷洜
- private String reason;
+ private String invalidReason;
+
+ //閫傚簲鐥�
+ private List<DeductionIndicationDto> indicationList;
public DeductionDto() {
--
Gitblit v1.8.0