From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java |    6 ++++++
 1 files changed, 6 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..393375f 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
@@ -96,6 +96,9 @@
     // 瀵规瘮鐓х墖璁板綍
     private String comparePhotoRecordJson;
 
+    // 鍒掓墸鐓х墖json
+    private String deductionPictureJson;
+
     // 鎵归噺娣诲姞椤圭洰id鍒楄〃
     private String userProjectIds;
 
@@ -134,6 +137,9 @@
     // phitab鍒掓墸鍒涘缓鏃堕棿
     private Date phitabCreateTime;
 
+    // 鏄惁鍙戦�佸垝鎵f秷鎭� 0 鍚� 1 鏄�
+    private int isSentNotice = 1;
+
     public DeductionDto() {
 
     }

--
Gitblit v1.8.0