Merge branch 'master-prod-new' into master-test

fwq

2024-03-26 b240f579f8850915cbcfeda9806db61269d13a79

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

@@ -35,6 +35,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;
}