From f3389d6291fb26fa0115b51ba1981e3002d670fb Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 19 三月 2024 15:46:41 +0800 Subject: [PATCH] Merge branch 'master-fwq-颜值规划4.0' into master-test --- phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java index f413d24..5c1ed48 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java @@ -34,6 +34,12 @@ private String visitOrderId; /** 鏄惁鑽夌*/ private Integer isDraft; - + /**寤鸿淇℃伅*/ private List<MicroPlanDto> planList; + /**棰滃�艰鍒掍俊鎭�*/ + private List<MicroDataDto> dataList; + /**鏌ヨ鏍囪瘑绫诲瀷:TreatPlan.typeStr*/ + private String typeStr; + private String firstId; + private String secondId; } -- Gitblit v1.8.0