From c2af7240d43586b8e3cc295e9e97f7d24278025d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期一, 27 五月 2024 14:37:54 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 a5e55e7..e251019 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;
@@ -96,6 +99,9 @@
// 瀵规瘮鐓х墖璁板綍
private String comparePhotoRecordJson;
+ // 鍒掓墸鐓х墖json
+ private String deductionPictureJson;
+
// 鎵归噺娣诲姞椤圭洰id鍒楄〃
private String userProjectIds;
@@ -137,6 +143,11 @@
// 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
private int isSentNotice = 1;
+ //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵ｃ�佸叾浠�
+ private String invalidReasonType;
+ //浣滃簾鍒掓墸鍘熷洜
+ private String invalidReason;
+
public DeductionDto() {
}
--
Gitblit v1.8.0