From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java |   17 +++++++++++++++++
 1 files changed, 17 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 db77806..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;
 
@@ -96,6 +99,9 @@
     // 瀵规瘮鐓х墖璁板綍
     private String comparePhotoRecordJson;
 
+    // 鍒掓墸鐓х墖json
+    private String deductionPictureJson;
+
     // 鎵归噺娣诲姞椤圭洰id鍒楄〃
     private String userProjectIds;
 
@@ -134,6 +140,17 @@
     // phitab鍒掓墸鍒涘缓鏃堕棿
     private Date phitabCreateTime;
 
+    // 鏄惁鍙戦�佸垝鎵f秷鎭� 0 鍚� 1 鏄�
+    private int isSentNotice = 1;
+
+    //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵c�佸叾浠�
+    private String invalidReasonType;
+    //浣滃簾鍒掓墸鍘熷洜
+    private String invalidReason;
+
+    //閫傚簲鐥�
+    private List<DeductionIndicationDto> indicationList;
+
     public DeductionDto() {
 
     }

--
Gitblit v1.8.0