Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

@@ -12,8 +12,11 @@

    /** 适应症标识(Indication) */
    private String indicationId;
    /** 其他适应症(有适应症id则为空) */
    private String otherInd;
    /** 程度类型标识(BaseClassify) */
    private String degreeTypeId;

    /** 适应症关联分类JSON字符 */
    private String typeJson;
    /** 排序号(前端排序) */