From b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 06 十二月 2023 19:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
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;
+ // 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
+ private int isSentNotice = 1;
+
public DeductionDto() {
}
--
Gitblit v1.8.0