From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期五, 12 七月 2024 14:09:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' 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; //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵c�佸叾浠� - private String reasonType; + private String invalidReasonType; //浣滃簾鍒掓墸鍘熷洜 - private String reason; + private String invalidReason; + + //閫傚簲鐥� + private List<DeductionIndicationDto> indicationList; public DeductionDto() { -- Gitblit v1.8.0