From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
index 55a0080..0c26f6f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
@@ -18,7 +18,10 @@
     private String recommend;
     /** 鎺掑簭鍙�(鍓嶇鎺掑簭) */
     private Integer sortNum;
-
+    /**鍒嗙被瀛楃涓�*/
+    private String typeJson;
+    /**鎺ㄨ崘椤圭洰*/
     private List<MicroPlanItemDto> itemList;
+    /**閫傚簲鐥�*/
     private List<MicroPlanIndicationDto> indicationList;
 }

--
Gitblit v1.8.0