From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 25 七月 2024 18:59:31 +0800 Subject: [PATCH] Merge branch 'master-base' into master-prod-new --- 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 393375f..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; @@ -140,6 +143,14 @@ // 鏄惁鍙戦�佸垝鎵f秷鎭� 0 鍚� 1 鏄� private int isSentNotice = 1; + //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵c�佸叾浠� + private String invalidReasonType; + //浣滃簾鍒掓墸鍘熷洜 + private String invalidReason; + + //閫傚簲鐥� + private List<DeductionIndicationDto> indicationList; + public DeductionDto() { } -- Gitblit v1.8.0