Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java

@@ -41,6 +41,10 @@
    private List<MicroDataDto> dataList;
    /**查询标识类型:TreatPlan.typeStr*/
    private String typeStr;
    /**查询一级标识*/
    private String firstId;
    /**查询二级标识*/
    private String secondId;
    /**关联多级标识*/
    private List<MicroRecordIdDto> idList;
}