Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

 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;
}